Merge changes Ia6b9d8cd,I1b5df5c4,Ibc6e21b7,I2fe53581,Iaba3c599, ... into main... (415d80e2) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+17 −17

Original line number	Original line	Diff line number	Diff line
	@@ -1902,7 +1902,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -1952,7 +1952,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -1981,7 +1981,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -2028,7 +2028,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -2620,7 +2620,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -2654,7 +2654,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -2689,7 +2689,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -2727,7 +2727,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -4256,14 +4256,14 @@ public final class BluetoothAdapter {
	try {		try {
	sService = mManagerService.registerAdapter(sManagerCallback);		sService = mManagerService.registerAdapter(sManagerCallback);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	} else {		} else {
	try {		try {
	mManagerService.unregisterAdapter(sManagerCallback);		mManagerService.unregisterAdapter(sManagerCallback);
	sService = null;		sService = null;
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	sServiceRegistered = wantRegistered;		sServiceRegistered = wantRegistered;
	@@ -5062,7 +5062,7 @@ public final class BluetoothAdapter {
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} finally {		} finally {
	@@ -5127,7 +5127,7 @@ public final class BluetoothAdapter {
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} finally {		} finally {
	@@ -5190,7 +5190,7 @@ public final class BluetoothAdapter {
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} finally {		} finally {
	@@ -5275,7 +5275,7 @@ public final class BluetoothAdapter {
	.getValue(defaultValue);		.getValue(defaultValue);
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} finally {		} finally {
	@@ -5356,7 +5356,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}
	@@ -5474,7 +5474,7 @@ public final class BluetoothAdapter {
	.getValue(defaultValue);		.getValue(defaultValue);
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} finally {		} finally {
	@@ -5554,7 +5554,7 @@ public final class BluetoothAdapter {
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} finally {		} finally {
	mServiceLock.readLock().unlock();		mServiceLock.readLock().unlock();
	}		}

framework/java/android/bluetooth/BluetoothDevice.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1765,7 +1765,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "", e);		Log.e(TAG, "", e);
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -2202,7 +2202,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "", e);		Log.e(TAG, "", e);
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -2249,7 +2249,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "", e);		Log.e(TAG, "", e);
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -3497,7 +3497,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "", e);		Log.e(TAG, "", e);
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;

framework/java/android/bluetooth/BluetoothHapClient.java

+21 −21

Original line number	Original line	Diff line number	Diff line
	@@ -591,7 +591,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}

	@@ -644,7 +644,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -686,7 +686,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -725,7 +725,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -759,7 +759,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -794,7 +794,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -827,7 +827,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -869,7 +869,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -901,7 +901,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -936,7 +936,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}

	@@ -969,7 +969,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	try {		try {
	service.selectPreset(device, presetIndex, mAttributionSource);		service.selectPreset(device, presetIndex, mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -1005,7 +1005,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	try {		try {
	service.selectPresetForGroup(groupId, presetIndex, mAttributionSource);		service.selectPresetForGroup(groupId, presetIndex, mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -1033,7 +1033,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	try {		try {
	service.switchToNextPreset(device, mAttributionSource);		service.switchToNextPreset(device, mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -1063,7 +1063,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	try {		try {
	service.switchToNextPresetForGroup(groupId, mAttributionSource);		service.switchToNextPresetForGroup(groupId, mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -1091,7 +1091,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	try {		try {
	service.switchToPreviousPreset(device, mAttributionSource);		service.switchToPreviousPreset(device, mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -1121,7 +1121,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	try {		try {
	service.switchToPreviousPresetForGroup(groupId, mAttributionSource);		service.switchToPreviousPresetForGroup(groupId, mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -1155,7 +1155,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -1189,7 +1189,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -1221,7 +1221,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -1348,7 +1348,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	try {		try {
	service.setPresetName(device, presetIndex, name, mAttributionSource);		service.setPresetName(device, presetIndex, name, mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -1383,7 +1383,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable
	try {		try {
	service.setPresetNameForGroup(groupId, presetIndex, name, mAttributionSource);		service.setPresetNameForGroup(groupId, presetIndex, name, mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}

framework/java/android/bluetooth/BluetoothHeadsetClient.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -873,7 +873,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose
	mAttributionSource);		mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	}		}
	@@ -910,7 +910,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose
	mAttributionSource);		mAttributionSource);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	}		}
	@@ -943,7 +943,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose
	return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);		return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	}		}
	@@ -1004,7 +1004,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose
	return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);		return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	}		}
	@@ -1062,7 +1062,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose
	return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);		return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	}		}

framework/java/android/bluetooth/BluetoothLeBroadcast.java

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -449,7 +449,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}

	@@ -502,7 +502,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException \| IllegalStateException e) {		} catch (TimeoutException \| IllegalStateException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	}		}
	@@ -574,7 +574,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (SecurityException e) {		} catch (SecurityException e) {
	throw e;		throw e;
	}		}
	@@ -614,7 +614,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (SecurityException e) {		} catch (SecurityException e) {
	throw e;		throw e;
	}		}
	@@ -663,7 +663,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (SecurityException e) {		} catch (SecurityException e) {
	throw e;		throw e;
	}		}
	@@ -709,7 +709,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (SecurityException e) {		} catch (SecurityException e) {
	throw e;		throw e;
	}		}
	@@ -751,7 +751,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	} catch (SecurityException e) {		} catch (SecurityException e) {
	throw e;		throw e;
	}		}
	@@ -786,7 +786,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -820,7 +820,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -848,7 +848,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -877,7 +877,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;
	@@ -909,7 +909,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi
	} catch (TimeoutException e) {		} catch (TimeoutException e) {
	Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowAsRuntimeException();
	}		}
	}		}
	return defaultValue;		return defaultValue;