diff options
| author | 2024-09-25 18:30:45 +0000 | |
|---|---|---|
| committer | 2024-09-25 18:30:45 +0000 | |
| commit | bc5859085a2182d62033d7f4f5fbe7d106f77731 (patch) | |
| tree | b53de2882d94a9720f86c50511b925da1ac04694 | |
| parent | d8df5cad103db0a3b98055ccadc7d71c0578cfe5 (diff) | |
| parent | 6276a30a06c346cdb0a4f1c70bd785dd3775a3f9 (diff) | |
Merge "audio: add try catch for BluetoothLeAudio.registerCallback in BtHelper.java" into main am: c50093fb11 am: 6276a30a06
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3276032
Change-Id: I9acd6ca4ebf050e55d3fe4f4215e813c4e09b8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/audio/BtHelper.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index ce92dfbcc1c8..b4212641346f 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -605,7 +605,11 @@ public class BtHelper { break; case BluetoothProfile.LE_AUDIO: if (mLeAudio != null && mLeAudioCallback != null) { - mLeAudio.unregisterCallback(mLeAudioCallback); + try { + mLeAudio.unregisterCallback(mLeAudioCallback); + } catch (Exception e) { + Log.e(TAG, "Exception while unregistering callback for LE audio", e); + } } mLeAudio = null; mLeAudioCallback = null; @@ -682,12 +686,21 @@ public class BtHelper { return; } if (mLeAudio != null && mLeAudioCallback != null) { - mLeAudio.unregisterCallback(mLeAudioCallback); + try { + mLeAudio.unregisterCallback(mLeAudioCallback); + } catch (Exception e) { + Log.e(TAG, "Exception while unregistering callback for LE audio", e); + } } mLeAudio = (BluetoothLeAudio) proxy; mLeAudioCallback = new MyLeAudioCallback(); - mLeAudio.registerCallback( - mContext.getMainExecutor(), mLeAudioCallback); + try{ + mLeAudio.registerCallback( + mContext.getMainExecutor(), mLeAudioCallback); + } catch (Exception e) { + mLeAudioCallback = null; + Log.e(TAG, "Exception while registering callback for LE audio", e); + } break; case BluetoothProfile.A2DP_SINK: case BluetoothProfile.LE_AUDIO_BROADCAST: |