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

Commit 115ba2ff authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8b4e7690a4d81d2dc7163414eca2bfd6e6cf3a2d
parents 36248d75 804ac87b

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: