Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move mForceDeniedNapps check into synchronized block" into sc-dev am: 0bc505c093 am: ecb301c33f

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

Change-Id: I7e92163d4ba505c6d8955f5cd03b8e2cc4803ac2
This commit is contained in:
TreeHugger Robot
2021-05-08 20:29:10 +00:00
committed by Automerger Merge Worker
parent 71806ba8b8 ecb301c33f
commit 36160e56a4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java
View File

@@ -665,7 +665,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
long nanoAppId, List<String> nanoappPermissions, boolean gracePeriodExpired) { long nanoAppId, List<String> nanoappPermissions, boolean gracePeriodExpired) {
return updateNanoAppAuthState( return updateNanoAppAuthState(
nanoAppId, nanoappPermissions, gracePeriodExpired, 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_GRACE_PERIOD -> DENIED only if the grace period expires
// DENIED/DENIED_GRACE_PERIOD -> GRANTED only if permissions are granted again // DENIED/DENIED_GRACE_PERIOD -> GRANTED only if permissions are granted again
// any state -> DENIED if "forceDenied" is true // any state -> DENIED if "forceDenied" is true
if (forceDenied) { if (forceDenied || mForceDeniedNapps.contains(nanoAppId)) {
newAuthState = AUTHORIZATION_DENIED; newAuthState = AUTHORIZATION_DENIED;
mForceDeniedNapps.add(nanoAppId); mForceDeniedNapps.add(nanoAppId);
} else if (gracePeriodExpired) { } else if (gracePeriodExpired) {