Merge "[PM] Fix the profile issue in UninstallerActivity" into main (21513aef) · Commits · e / os / android_frameworks_base

packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java

+13 −10

Original line number	Diff line number	Diff line
		@@ -47,19 +47,19 @@ import android.os.Process;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.Log;

		import androidx.annotation.NonNull;
		import androidx.annotation.StringRes;

		import com.android.packageinstaller.common.EventResultPersister;
		import com.android.packageinstaller.common.UninstallEventReceiver;
		import com.android.packageinstaller.handheld.ErrorDialogFragment;
		import com.android.packageinstaller.handheld.UninstallAlertDialogFragment;
		import com.android.packageinstaller.television.ErrorFragment;
		import com.android.packageinstaller.television.UninstallAlertFragment;
		import com.android.packageinstaller.television.UninstallAppProgress;
		import com.android.packageinstaller.common.EventResultPersister;
		import com.android.packageinstaller.common.UninstallEventReceiver;
		import com.android.packageinstaller.v2.ui.UninstallLaunch;

		import java.util.List;

		/*
		* This activity presents UI to uninstall an application. Usually launched with intent
		* Intent.ACTION_UNINSTALL_PKG_COMMAND and attribute
		@@ -181,14 +181,17 @@ public class UninstallerActivity extends Activity {
		if (mDialogInfo.user == null) {
		mDialogInfo.user = Process.myUserHandle();
		} else {
		List<UserHandle> profiles = userManager.getUserProfiles();
		if (!profiles.contains(mDialogInfo.user)) {
		if (mDialogInfo.user != Process.myUserHandle()) {
		final boolean isCurrentUserProfileOwner =
		(Process.myUserHandle() == userManager.getProfileParent(mDialogInfo.user));
		if (!isCurrentUserProfileOwner) {
		Log.e(TAG, "User " + Process.myUserHandle() + " can't request uninstall "
		+ "for user " + mDialogInfo.user);
		showUserIsNotAllowed();
		return;
		}
		}
		}

		mDialogInfo.callback = intent.getParcelableExtra(PackageInstaller.EXTRA_CALLBACK,
		PackageManager.UninstallCompleteCallback.class);