commit 51098f02eb3d0d95815f283190fe04c93c7da039
author Pavel Maltsev <pavelm@google.com> Wed Jun 12 11:49:52 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 12 11:49:52 2019 -0700
tree a6940912d8674eba4fd2f09a356861988add29a2
parent c0f678a56266fe9f062da4f1b281db7b8677e3ae
parent a9dc5050a655fcf10427a152092311b4a4b95d0f

Merge "Unlink from death recipient in projection service" into qt-dev
am: a9dc5050a6

Change-Id: I9e8b17de4baa8d43d6c10e46134d5f2162c07399

service/src/com/android/car/CarProjectionService.java

diff --git a/service/src/com/android/car/CarProjectionService.java b/service/src/com/android/car/CarProjectionService.java
index 25edc79..e150c27 100644
--- a/service/src/com/android/car/CarProjectionService.java
+++ b/service/src/com/android/car/CarProjectionService.java
@@ -459,7 +459,12 @@
     private void unregisterProjectionReceiverClient(IBinder token) {
         synchronized (mLock) {
             ProjectionReceiverClient client = mProjectionReceiverClients.remove(token);
-            if (client != null && TextUtils.equals(
+            if (client == null) {
+                Log.w(TAG, "Projection receiver client for token " + token + " doesn't exist");
+                return;
+            }
+            token.unlinkToDeath(client.mDeathRecipient, 0);
+            if (TextUtils.equals(
                     client.mProjectionStatus.getPackageName(), mCurrentProjectionPackage)) {
                 mCurrentProjectionPackage = null;
                 mCurrentProjectionState = PROJECTION_STATE_INACTIVE;