Merge "Fix NPE of TopTaskTracker" into tm-qpr-dev

This commit is contained in:
Fengjiang Li
2023-03-09 18:25:07 +00:00
committed by Android (Google) Code Review

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();
}
}
}