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

Merge "Use killUid() instead of killApplication()." into rvc-dev am: 804ac87b48

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11721690

Change-Id: Iaa74fcef8167a2e068161e9f34281662165a048d
This commit is contained in:
Martijn Coenen
2020-06-05 14:47:20 +00:00
committed by Automerger Merge Worker
parent a8f6a41f17 804ac87b48
commit f0df75e39c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4657,9 +4657,8 @@ class StorageManagerService extends IStorageManager.Stub
private void killAppForOpChange(int code, int uid, String packageName) {
final IActivityManager am = ActivityManager.getService();
try {
am.killApplication(packageName,
UserHandle.getAppId(uid),
UserHandle.USER_ALL, AppOpsManager.opToName(code) + " changed.");
am.killUid(UserHandle.getAppId(uid), UserHandle.USER_ALL,
AppOpsManager.opToName(code) + " changed.");
} catch (RemoteException e) {
}
}
@@ -4681,7 +4680,12 @@ class StorageManagerService extends IStorageManager.Stub
// results in a bad UX, especially since the gid only gives access
// to unreliable volumes, USB OTGs that are rarely mounted. The app
// will get the external_storage gid on next organic restart.
killAppForOpChange(code, uid, packageName);
if (packageName != null) {
killAppForOpChange(code, uid, packageName);
} else {
// TODO(b/158283222) this can happen, figure out if we need
// to kill in this case as well.
}
}
return;
case OP_LEGACY_STORAGE: