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

Merge "Use USER_SYSTEM instead of USER_ALL when enabling rollback." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-17 15:32:28 +00:00
committed by Android (Google) Code Review
parent 2deeadae72 d6f83bb511
commit 00202de30e
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -14620,6 +14620,20 @@ public class PackageManagerService extends IPackageManager.Stub
return mUser;
}
/**
* Gets the user handle for the user that the rollback agent should
* use to look up information about this installation when enabling
* rollback.
*/
UserHandle getRollbackUser() {
// The session for packages installed for "all" users is
// associated with the "system" user.
if (mUser == UserHandle.ALL) {
return UserHandle.SYSTEM;
}
return mUser;
}
HandlerParams setTraceMethod(String traceMethod) {
this.traceMethod = traceMethod;
return this;
@@ -15238,7 +15252,7 @@ public class PackageManagerService extends IPackageManager.Stub
installedUsers);
enableRollbackIntent.putExtra(
PackageManagerInternal.EXTRA_ENABLE_ROLLBACK_USER,
getUser().getIdentifier());
getRollbackUser().getIdentifier());
enableRollbackIntent.setDataAndType(Uri.fromFile(new File(origin.resolvedPath)),
PACKAGE_MIME_TYPE);
enableRollbackIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);