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

Commit a02ae06a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove android.permission.flags.dont_remove_existing_uid_states" into main

parents 2360ca49 e4c64839

core/java/android/permission/flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -244,17 +244,6 @@ flag { 
    bug: "325536053"

}



flag {

    name: "dont_remove_existing_uid_states"

    is_fixed_read_only: true

    namespace: "permissions"

    description: "Double check if the uid still exists before attempting to remove its appops state"

    bug: "353474742"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

  name: "sync_on_op_noted_api"

  namespace: "permissions"

services/core/java/com/android/server/appop/AppOpsService.java

+11 −13
Original line number Diff line number Diff line
@@ -1479,7 +1479,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
    }



    public void uidRemoved(int uid) {

        if (Flags.dontRemoveExistingUidStates()) {

        // b/358365471 If apps sharing UID are installed on multiple users and only one of

        // them is installed for a single user while keeping the others we observe this

        // subroutine get invoked incorrectly since the UID still exists.
@@ -1493,7 +1492,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
        } finally {

            Binder.restoreCallingIdentity(token);

        }

        }



        synchronized (this) {

            if (mUidStates.indexOfKey(uid) >= 0) {