Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I8e4a122767d16a746d76c0f5837667cb693ed1ee
This commit is contained in:
Eric Laurent
2020-04-09 19:17:59 +00:00
committed by Automerger Merge Worker
parent 55a373f96e bcfd42d906
commit 2c7f34cb0e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -3622,7 +3622,15 @@ public class AudioService extends IAudioService.Stub
hdlr = h; hdlr = h;
// Remove from client list so that it is re-inserted at top of list // Remove from client list so that it is re-inserted at top of list
iter.remove(); iter.remove();
try {
hdlr.getBinder().unlinkToDeath(hdlr, 0); hdlr.getBinder().unlinkToDeath(hdlr, 0);
if (cb != hdlr.getBinder()){
hdlr = null;
}
} catch (NoSuchElementException e) {
hdlr = null;
Log.w(TAG, "link does not exist ...");
}
break; break;
} }
} }