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
2021-02-10 20:13:34 +00:00
parent 444fd9185c ae40794528
commit d0d61680b2
1 changed files with 1 additions and 0 deletions
--- 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 */