Merge "RESTRICT AUTOMERGE [PM] Fix the profile issue in UninstallerActivity" into sc-dev (cc2adc0e) · Commits · e / os / android_frameworks_base

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

100755 → 100644

+11 −9

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import android.net.Uri;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		@@ -63,8 +64,6 @@ import com.android.packageinstaller.television.ErrorFragment;
		import com.android.packageinstaller.television.UninstallAlertFragment;
		import com.android.packageinstaller.television.UninstallAppProgress;

		import java.util.List;

		/*
		* This activity presents UI to uninstall an application. Usually launched with intent
		* Intent.ACTION_UNINSTALL_PKG_COMMAND and attribute
		@@ -172,15 +171,18 @@ public class UninstallerActivity extends Activity {
		if (mDialogInfo.user == null) {
		mDialogInfo.user = android.os.Process.myUserHandle();
		} else {
		UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
		List<UserHandle> profiles = userManager.getUserProfiles();
		if (!profiles.contains(mDialogInfo.user)) {
		Log.e(TAG, "User " + android.os.Process.myUserHandle() + " can't request uninstall "
		if (!mDialogInfo.user.equals(Process.myUserHandle())) {
		UserManager userManager = getBaseContext().getSystemService(UserManager.class);
		final boolean isCurrentUserProfileOwner = Process.myUserHandle().equals(
		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.getIBinderExtra(PackageInstaller.EXTRA_CALLBACK);