Merge TP1A.220328.001

Change-Id: I5f07094ba2fb3991da03673f97d2957b1f68018b

1 files changed, 1 insertions, 2 deletions

diff --git a/framework/java/android/bluetooth/BluetoothLeAudio.java b/framework/java/android/bluetooth/BluetoothLeAudio.java
index 6d416434b2..9d77125271 100644
--- a/framework/java/android/bluetooth/BluetoothLeAudio.java
+++ b/framework/java/android/bluetooth/BluetoothLeAudio.java
@@ -960,9 +960,8 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
                         service.registerCallback(mCallback, mAttributionSource, recv);
                         recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);
                     }
-                } catch (IllegalStateException | TimeoutException e) {
+                } catch (TimeoutException e) {
                     Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
-                    throw new IllegalStateException("Unexpected error", e);
                 } catch (RemoteException e) {
                     throw e.rethrowFromSystemServer();
                 }