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

Merge "Temporarily stop killing apps when OP_REQUEST_INSTALL_PACKAGES is denied." into qt-dev

Browse Source 
am: 789651e201

Change-Id: I624d5a3ec99dc0972b5ea9241fc4cd41eb595bff
This commit is contained in:
Sudheer Shanka
2019-05-24 19:26:37 -07:00
committed by android-build-merger
parent f3b2925416 789651e201
commit 12d1e428ff
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -3243,22 +3243,7 @@ class StorageManagerService extends IStorageManager.Stub
public void opChanged(int op, int uid, String packageName) throws RemoteException { public void opChanged(int op, int uid, String packageName) throws RemoteException {
if (!ENABLE_ISOLATED_STORAGE) return; if (!ENABLE_ISOLATED_STORAGE) return;
if (op == OP_REQUEST_INSTALL_PACKAGES) { remountUidExternalStorage(uid, getMountMode(uid, packageName));
// Only handling the case when the appop is denied. The other cases will be
// handled in the synchronous callback from AppOpsService.
if (packageName != null && mIAppOpsService.checkOperation(
OP_REQUEST_INSTALL_PACKAGES, uid, packageName) != MODE_ALLOWED) {
try {
ActivityManager.getService().killUid(
UserHandle.getAppId(uid), UserHandle.getUserId(uid),
"OP_REQUEST_INSTALL_PACKAGES is denied");
} catch (RemoteException e) {
// same process - should not happen
}
}
} else {
remountUidExternalStorage(uid, getMountMode(uid, packageName));
}
} }
}; };