Merge "Fix NPE of TopTaskTracker" into tm-qpr-dev am: c523de6dc2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21894262

Change-Id: I7b256fd8620c02797c7dc25f0943badc7b5ad437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fengjiang Li
2023-03-09 18:53:52 +00:00
committed by Automerger Merge Worker

View File

@@ -302,7 +302,10 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
@Nullable
public String getPackageName() {
return mTopTask == null ? null : mTopTask.baseActivity.getPackageName();
if (mTopTask == null || mTopTask.baseActivity == null) {
return null;
}
return mTopTask.baseActivity.getPackageName();
}
}
}