Merge "Skip dialog to unlock private space while launching apps" into main (c4cf8b6a) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/UnlaunchableAppActivity.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ public class UnlaunchableAppActivity extends Activity
		mUserId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
		mTarget = intent.getParcelableExtra(Intent.EXTRA_INTENT,
		android.content.IntentSender.class);
		String targetPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
		final UserManager userManager = UserManager.get(this);

		if (mUserId == UserHandle.USER_NULL) {
		Log.wtf(TAG, "Invalid user id: " + mUserId + ". Stopping.");
		@@ -74,13 +76,20 @@ public class UnlaunchableAppActivity extends Activity
		return;
		}

		if (android.os.Flags.allowPrivateProfile()
		&& !userManager.isManagedProfile(mUserId)) {
		Log.e(TAG, "Unlaunchable activity for target package " + targetPackageName
		+ " called for a non-managed-profile " + mUserId);
		finish();
		return;
		}

		if (mReason != UNLAUNCHABLE_REASON_QUIET_MODE) {
		Log.wtf(TAG, "Invalid unlaunchable type: " + mReason);
		finish();
		return;
		}

		String targetPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
		boolean showEmergencyCallButton =
		(targetPackageName != null && targetPackageName.equals(
		mTelecomManager.getDefaultDialerPackage(UserHandle.of(mUserId))));