Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c39688bb authored May 23, 2023 by Kyunglyul Hyun Committed by Automerger Merge Worker May 23, 2023

Merge "No crash when remote service dead" am: 380d3f49

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2596948

Change-Id: I8a3c94b677ff685199d29fc421a62c2985be7d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 0dd6bfd4 380d3f49

framework/java/android/bluetooth/BluetoothHapClient.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -88,11 +88,9 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
		service.registerCallback(mCallback, mAttributionSource, recv);
		recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);
		}
		} catch (TimeoutException e) {
		} catch (RemoteException \| TimeoutException e) {
		Log.e(TAG, e.toString() + "\n"
		+ Log.getStackTraceString(new Throwable()));
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

framework/java/android/bluetooth/BluetoothLeAudio.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -91,10 +91,8 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
		service.registerCallback(mCallback, mAttributionSource, recv);
		recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);
		}
		} catch (TimeoutException e) {
		} catch (RemoteException \| TimeoutException e) {
		Log.e(TAG, "Failed to register callback", e);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

framework/java/android/bluetooth/BluetoothLeBroadcast.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -194,11 +194,12 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
		recv.awaitResultNoInterrupt(getSyncTimeout())
		.getValue(null);
		}
		} catch (TimeoutException e) {
		Log.e(TAG, "onBluetoothServiceUp: Failed to register "
		+ "Le Broadcaster callback", e);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		} catch (RemoteException \| TimeoutException e) {
		Log.e(
		TAG,
		"onServiceConnected: Failed to register "
		+ "Le Broadcaster callback",
		e);
		}
		}
		}