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

Commit 0bc505c0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move mForceDeniedNapps check into synchronized block" into sc-dev

parents 7e7c76c8 8800ba65

services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java

+2 −2
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub 
            long nanoAppId, List<String> nanoappPermissions, boolean gracePeriodExpired) {

        return updateNanoAppAuthState(

                nanoAppId, nanoappPermissions, gracePeriodExpired,

                mForceDeniedNapps.contains(nanoAppId) /* forceDenied */);

                false /* forceDenied */);

    }



    /**
@@ -705,7 +705,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub 
            // DENIED_GRACE_PERIOD -> DENIED only if the grace period expires

            // DENIED/DENIED_GRACE_PERIOD -> GRANTED only if permissions are granted again

            // any state -> DENIED if "forceDenied" is true

            if (forceDenied) {

            if (forceDenied || mForceDeniedNapps.contains(nanoAppId)) {

                newAuthState = AUTHORIZATION_DENIED;

                mForceDeniedNapps.add(nanoAppId);

            } else if (gracePeriodExpired) {