summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tianjie Xu <xunchang@google.com> 2021-02-10 20:13:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-02-10 20:13:34 +0000
commitd0d61680b23cf1b285005c7fa1bec24f1c6af563 (patch)
treeaacedb93fd17f848277fe2dc93334a87d3426124
parent444fd9185caef69cebd14a75d15bdd9b576dd4cc (diff)
parentae40794528b9d9648a62338c62a2d34280853d56 (diff)
Merge "Reset binder during unbinding" am: eda5da6b92 am: 03b0f9ca87 am: ae40794528
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580986 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I959dfef8d93d8bbd259c3c1b5561c7c7d4b1e0d0
-rw-r--r--services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java b/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java
index a1e18bd5a6bd..5bd3f6455ecb 100644
--- a/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java
+++ b/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java
@@ -120,6 +120,7 @@ public class ResumeOnRebootServiceProvider {
if (mServiceConnection != null) {
mContext.unbindService(mServiceConnection);
}
+ mBinder = null;
}
/** Bind to the service */