commit 23cd9dab01bff3ce7bd2fd275411fc99a903f2b4
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 15 18:10:23 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 15 18:10:24 2016 +0000
tree 7b84a6d4971bb1d9edc32933dff351a26880aaac
parent 82a0ccac6a74b17b6499bc06bb7eb0e5f942887a
parent fbbeb3e54a73e0fa7dbd5c2c1093705e69ae27da

Merge "CEC: Remove listener records only if they are currently used" into nyc-dev

services/core/java/com/android/server/hdmi/HdmiControlService.java

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index fed7e4b..e07d72f 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -1189,7 +1189,9 @@
         @Override
         public void binderDied() {
             synchronized (mLock) {
-                mRecordListenerRecord = null;
+                if (mRecordListenerRecord == this) {
+                    mRecordListenerRecord = null;
+                }
             }
         }
     }
@@ -1813,7 +1815,9 @@
         @Override
         public void binderDied() {
             synchronized (mLock) {
-                mInputChangeListenerRecord = null;
+                if (mInputChangeListenerRecord == this) {
+                    mInputChangeListenerRecord = null;
+                }
             }
         }
     }