From 967cb0aed7bdb2590cb0e4a68918fc4541cc0fff Mon Sep 17 00:00:00 2001
From: Adam He <adamhe@google.com>
Date: Mon, 8 Apr 2019 14:37:58 -0700
Subject: [PATCH] Fixes crash due to assigning service before linking death
 recipient.

Fixes: 129686274
Test: atest CtsAutoFillServiceTestCases
Change-Id: I052ca9a13947f0ad25da70747e8db2be22af742b
---
 core/java/com/android/internal/infra/AbstractRemoteService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/infra/AbstractRemoteService.java b/core/java/com/android/internal/infra/AbstractRemoteService.java
index 1155854efd559..ef5178aca40a0 100644
--- a/core/java/com/android/internal/infra/AbstractRemoteService.java
+++ b/core/java/com/android/internal/infra/AbstractRemoteService.java
@@ -449,13 +449,13 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
                 return;
             }
             mBinding = false;
-            mService = getServiceInterface(service);
             try {
                 service.linkToDeath(AbstractRemoteService.this, 0);
             } catch (RemoteException re) {
                 handleBinderDied();
                 return;
             }
+            mService = getServiceInterface(service);
             handleOnConnectedStateChangedInternal(true);
             mServiceDied = false;
         }