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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-08 19:59:13 +00:00
committed by Android (Google) Code Review
parent 7e7c76c8a8 8800ba65c8
commit 0bc505c093
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) {
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) {