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

Commit ef971544 authored by Svet Ganov's avatar Svet Ganov Committed by android-build-merger
Browse files

Merge "Kill app if revoking a permission while resetting app prefs" into nyc-dev am: 699632c6 

am: 07e89228

* commit '07e89228':
  Kill app if revoking a permission while resetting app prefs

Change-Id: Ic3304a659a39d999697d72275b984ec28b72af23
parents 6b60f066 07e89228

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −5
Original line number Diff line number Diff line
@@ -15511,17 +15511,14 @@ public class PackageManagerService extends IPackageManager.Stub { 
                // Otherwise, reset the permission.

                final int revokeResult = permissionsState.revokeRuntimePermission(bp, userId);

                switch (revokeResult) {

                    case PERMISSION_OPERATION_SUCCESS: {

                        writeRuntimePermissions = true;

                    } break;













                    case PERMISSION_OPERATION_SUCCESS:















                    case PERMISSION_OPERATION_SUCCESS_GIDS_CHANGED: {















                        writeRuntimePermissions = true;















                        final int appId = ps.appId;















                        mHandler.post(new Runnable() {















                            @Override















                            public void run() {













                                killUid(appId, userId, KILL_APP_REASON_GIDS_CHANGED);













                                killUid(appId, userId, KILL_APP_REASON_PERMISSIONS_REVOKED);















                            }















                        });















                    } break;