Merge "Only clean the client if no pending intent exist." into tm-qpr-dev

2022-07-26 22:07:44 +00:00
parent 2ff2a64cfe 1d2aa14abd
commit 4f375f8502
1 changed files with 2 additions and 3 deletions
--- a/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java
+++ b/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java
@@ -871,10 +871,9 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
        if (!mPendingIntentRequest.hasPendingIntent() && mRegistered) {
            mClientManager.unregisterClient(mHostEndPointId);
            mRegistered = false;
+            mAppOpsManager.stopWatchingMode(this);
+            mContextHubProxy.onHostEndpointDisconnected(mHostEndPointId);
        }
-        mAppOpsManager.stopWatchingMode(this);
-
-        mContextHubProxy.onHostEndpointDisconnected(mHostEndPointId);
    }

    private String authStateToString(@ContextHubManager.AuthorizationState int state) {