Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I9d3b4f8f,I4854a310

Browse Source 
* changes:
  shell pm: move context creation to where it's used
  adb shell pm: create context as the right user
This commit is contained in:
TreeHugger Robot
2020-12-03 00:04:16 +00:00
committed by Android (Google) Code Review
parent 26a949ed1a 2cae9f6275
commit 33064dbac9
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -146,7 +146,7 @@ class PackageManagerShellCommand extends ShellCommand {
final IPackageManager mInterface;
final IPermissionManager mPermissionManager;
final Context mShellPackageContext;
final Context mContext;
final private WeakHashMap<String, Resources> mResourceCache =
new WeakHashMap<String, Resources>();
int mTargetUser;
@@ -158,12 +158,7 @@ class PackageManagerShellCommand extends ShellCommand {
PackageManagerService service, IPermissionManager permissionManager, Context context) {
mInterface = service;
mPermissionManager = permissionManager;
try {
mShellPackageContext = context.createPackageContext("com.android.shell", 0);
} catch (NameNotFoundException e) {
// should not happen
throw new RuntimeException(e);
}
mContext = context;
}
@Override
@@ -486,8 +481,17 @@ class PackageManagerShellCommand extends ShellCommand {
return 1;
}
final Context shellPackageContext;
try {
shellPackageContext = mContext.createPackageContextAsUser(
"com.android.shell", 0, Binder.getCallingUserHandle());
} catch (NameNotFoundException e) {
// should not happen
throw new RuntimeException(e);
}
final LocalIntentReceiver receiver = new LocalIntentReceiver();
RollbackManager rm = mShellPackageContext.getSystemService(RollbackManager.class);
RollbackManager rm = shellPackageContext.getSystemService(RollbackManager.class);
RollbackInfo rollback = null;
for (RollbackInfo r : rm.getAvailableRollbacks()) {
for (PackageRollbackInfo info : r.getPackages()) {