Merge "Fix NPE of TopTaskTracker" into tm-qpr-dev (c523de6d) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/TopTaskTracker.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}
		}