commit e9accecd1d8921f6274b1d3a92735c68f8b8384c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 22:40:59 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 22:40:59 2020 +0000
tree 054fc4e3bfa4e441d5ae24e31a038e3a89892df0
parent 7949f4e399f435471639c2f538fa786796e7dc9a
parent 407f4c5c476d0da5538e549c8a0716a7b3ba7239

Merge "RecordingActivityMonitor: remove spam from death events" am: 91d0f80387 am: 407f4c5c47

Change-Id: I85cbd7cecddc7e5c2c4f4e442edb4d60f50a45c4

services/core/java/com/android/server/audio/RecordingActivityMonitor.java

diff --git a/services/core/java/com/android/server/audio/RecordingActivityMonitor.java b/services/core/java/com/android/server/audio/RecordingActivityMonitor.java
index 5d31dbe..5c50962 100644
--- a/services/core/java/com/android/server/audio/RecordingActivityMonitor.java
+++ b/services/core/java/com/android/server/audio/RecordingActivityMonitor.java
@@ -86,6 +86,12 @@
             return mIsActive && mConfig != null;
         }
 
+        void release() {
+            if (mDeathHandler != null) {
+                mDeathHandler.release();
+            }
+        }
+
         // returns true if status of an active recording has changed
         boolean setActive(boolean active) {
             if (mIsActive == active) return false;
@@ -417,6 +423,7 @@
                     break;
                 case AudioManager.RECORD_CONFIG_EVENT_RELEASE:
                     configChanged = state.isActiveConfiguration();
+                    state.release();
                     mRecordStates.remove(stateIndex);
                     break;
                 default:
@@ -519,6 +526,10 @@
                 return false;
             }
         }
+
+        void release() {
+            mRecorderToken.unlinkToDeath(this, 0);
+        }
     }
 
     /**