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

Fix system service crash on radio session death. DO NOT MERGE

Browse Source 
This is a partial cherry-pick from ag/7063548

Bug: 140203726
Test: adb shell am start -S -W -n com.android.car.radio/.RadioActivity
      (multiple times)

Change-Id: I6f16ff6eb82fca63c697d284fb3f45c2bb2be38c
This commit is contained in:
Tomasz Wasilczyk
2019-12-19 13:03:38 -08:00
parent 556bdce162
commit 1b16c57b57
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/broadcastradio/hal2/RadioModule.java
View File

@@ -233,18 +233,24 @@ class RadioModule {
} }
private void fanoutAidlCallbackLocked(AidlCallbackRunnable runnable) { private void fanoutAidlCallbackLocked(AidlCallbackRunnable runnable) {
List<TunerSession> deadSessions = null;
for (TunerSession tunerSession : mAidlTunerSessions) { for (TunerSession tunerSession : mAidlTunerSessions) {
try { try {
runnable.run(tunerSession.mCallback); runnable.run(tunerSession.mCallback);
} catch (DeadObjectException ex) { } catch (DeadObjectException ex) {
// The other side died without calling close(), so just purge it from our // The other side died without calling close(), so just purge it from our records.
// records.
Slog.e(TAG, "Removing dead TunerSession"); Slog.e(TAG, "Removing dead TunerSession");
mAidlTunerSessions.remove(tunerSession); if (deadSessions == null) {
deadSessions = new ArrayList<>();
}
deadSessions.add(tunerSession);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Slog.e(TAG, "Failed to invoke ITunerCallback: ", ex); Slog.e(TAG, "Failed to invoke ITunerCallback: ", ex);
} }
} }
if (deadSessions != null) {
mAidlTunerSessions.removeAll(deadSessions);
}
} }
public android.hardware.radio.ICloseHandle addAnnouncementListener(@NonNull int[] enabledTypes, public android.hardware.radio.ICloseHandle addAnnouncementListener(@NonNull int[] enabledTypes,