Merge "Fallback to home activity from packageManager if supplier returns null" into main (ae00d37f) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/DesktopModeCompatPolicy.java

+3 −10

Original line number	Diff line number	Diff line
		@@ -49,14 +49,6 @@ public class DesktopModeCompatPolicy {
		public DesktopModeCompatPolicy(@NonNull Context context) {
		mContext = context;
		mSystemUiPackage = context.getResources().getString(R.string.config_systemUi);
		mDefaultHomePackageSupplier = () -> {
		final ComponentName homeActivities = getPackageManager().getHomeActivities(
		new ArrayList<>());
		if (homeActivities != null) {
		return homeActivities.getPackageName();
		}
		return null;
		};
		}

		public void setDefaultHomePackageSupplier(
		@@ -74,8 +66,9 @@ public class DesktopModeCompatPolicy {
		return mPackageManager;
		}

		@Nullable
		private String getDefaultHomePackage() {
		if (mDefaultHomePackageSupplier != null) {
		if (mDefaultHomePackageSupplier != null && mDefaultHomePackageSupplier.get() != null) {
		return mDefaultHomePackageSupplier.get();
		}

		@@ -259,7 +252,7 @@ public class DesktopModeCompatPolicy {
		* currently no default home package available.
		*/
		private boolean isPartOfDefaultHomePackageOrNoHomeAvailable(@Nullable String packageName) {
		final String defaultHomePackage = mDefaultHomePackageSupplier.get();
		final String defaultHomePackage = getDefaultHomePackage();
		return defaultHomePackage == null \|\| (packageName != null
		&& packageName.equals(defaultHomePackage));
		}