From dc2b792589673434764c74f3f21039ec72c22b4a Mon Sep 17 00:00:00 2001
From: Tianjie <xunchang@google.com>
Date: Mon, 8 Feb 2021 15:43:06 -0800
Subject: [PATCH] Reset binder during unbinding

On some rare case, we may encounter a DeadObjectException on wrap()
when a new test app is installed. This happens because we reuse the
binder from the previous bindToService() call. Always reset the
binder to make sure this doesn't happen.

Bug: 172780686
Test: run storeRebootEscrowKey twice

Change-Id: I36150ef39f870e38a5f1b4bd814465d70f8dbf85
---
 .../server/locksettings/ResumeOnRebootServiceProvider.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java b/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java
index a1e18bd5a6bd4..5bd3f6455ecb1 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 */