Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bb801eb authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Use killUid() instead of killApplication(). 

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
parent 38e3d616

services/core/java/com/android/server/StorageManagerService.java

+8 −4
Original line number Diff line number Diff line
@@ -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.

                                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: