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 am: 2c7f34cb0e am: 4d9f3484c7

Browse Source 
Change-Id: I35c05481401a1648e9b969b15560453c5d8c6320
This commit is contained in:
Eric Laurent
2020-04-09 19:45:00 +00:00
committed by Automerger Merge Worker
parent 6068bc2a98 4d9f3484c7
commit e8a4de96bc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}