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

Commit 36160e56 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move mForceDeniedNapps check into synchronized block" into sc-dev am:... 

Merge "Move mForceDeniedNapps check into synchronized block" into sc-dev am: 0bc505c0 am: ecb301c3

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

Change-Id: I7e92163d4ba505c6d8955f5cd03b8e2cc4803ac2
parents 71806ba8 ecb301c3

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) {