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

Use killUid() instead of killApplication().

Browse Source 
killApplication() doesn't just kill the process, but also tears down its
entire task stack, meaning it won't be restarted when that task becomes
visible again. Use killUid() instead, which does have this property.

Bug: 157674306
Test: manual verification
Change-Id: I691d9fe96b64012c96e0595385bb482056b6c4d4
This commit is contained in:
Martijn Coenen
2020-06-04 06:15:43 +02:00
parent 38e3d616bc
commit 6bb801ebb3
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: