Merge "AudioService: fix audio mode not reset to MODE_NORMAL" am: 87685d3648 am: bcfd42d906 am: 2c7f34cb0e

Change-Id: I1215679cb66aa6ba768385176a37086f2c2fb488
2020-04-09 19:31:15 +00:00
parent f0188f85a9 2c7f34cb0e
commit 4d9f3484c7
1 changed files with 9 additions and 1 deletions
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -3622,7 +3622,15 @@ public class AudioService extends IAudioService.Stub
                hdlr = h;
                // Remove from client list so that it is re-inserted at top of list
                iter.remove();
-                hdlr.getBinder().unlinkToDeath(hdlr, 0);
+                try {
+                    hdlr.getBinder().unlinkToDeath(hdlr, 0);
+                    if (cb != hdlr.getBinder()){
+                        hdlr = null;
+                    }
+                } catch (NoSuchElementException e) {
+                    hdlr = null;
+                    Log.w(TAG, "link does not exist ...");
+                }
                break;
            }
        }