Merge "Fixes crash due to assigning service before linking death recipient." into qt-dev am: e3aa7b9ac3

am: c41c7b35d5

Change-Id: I5cf52b7b9820d5082c533dc602ce5cef0498dc6b

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;
         }