diff options
| author | 2022-07-26 22:27:27 +0000 | |
|---|---|---|
| committer | 2022-07-26 22:27:27 +0000 | |
| commit | 73956d07a5fcba2ba33a3170c5bc1b0e92b9e93b (patch) | |
| tree | dcf3a94dd50a1180498235d9211e2bbb7625d776 | |
| parent | 315f6f124d66af1983cc6813c21191a62b038f1d (diff) | |
| parent | 4f375f8502f0289691fc448eb082fc15040b5521 (diff) | |
Merge "Only clean the client if no pending intent exist." into tm-qpr-dev am: 4f375f8502
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19323830
Change-Id: Id6f8cfbfadd2953de4db704955628ee2a278dbe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java b/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java index 9fb1d8e744fb..625f1936e28e 100644 --- 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) { |