Merge "Reset binder during unbinding" am: eda5da6b92 am: 03b0f9ca87

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580986 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4fbf4bd553453537d45afdd5553dd7839df95238
2021-02-10 19:52:06 +00:00
parent 26bceb2583 03b0f9ca87
commit ae40794528
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 */