Skip to content
Snippets Groups Projects
Commit b50ef041 authored by Jack He's avatar Jack He Committed by Gerrit Code Review
Browse files

Merge "VolumeControl: Early return in registerCallback" into main

parents d6503c2b b6d8b917
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
framework/java/android/bluetooth/BluetoothVolumeControl.java
+ 73
− 84
View file @ b50ef041
......@@ -476,107 +476,96 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
throw new IllegalArgumentException("This callback has already been registered");
}
final IBluetoothVolumeControl service = getService();
if (service == null) {
return;
}
try {
final IBluetoothVolumeControl service = getService();
if (service != null) {
final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();
final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();
/* If the callback map is empty, we register the service-to-app callback.
* Otherwise, callback is registered in mCallbackExecutorMap and we just notify
* user over callback with current values.
*/
boolean isRegisterCallbackRequired = mCallbackExecutorMap.isEmpty();
mCallbackExecutorMap.put(callback, executor);
if (isRegisterCallbackRequired) {
service.registerCallback(mCallback, mAttributionSource, recv);
} else {
service.notifyNewRegisteredCallback(
new IBluetoothVolumeControlCallback.Stub() {
@Override
public void onVolumeOffsetChanged(
BluetoothDevice device,
int instanceId,
int volumeOffset)
throws RemoteException {
Attributable.setAttributionSource(
device, mAttributionSource);
/* If the callback map is empty, we register the service-to-app callback.
* Otherwise, callback is registered in mCallbackExecutorMap and we just notify
* user over callback with current values.
*/
boolean isRegisterCallbackRequired = mCallbackExecutorMap.isEmpty();
mCallbackExecutorMap.put(callback, executor);
// The old API operates on the first instance only
if (instanceId == 1) {
try {
executor.execute(
() ->
callback.onVolumeOffsetChanged(
device, volumeOffset));
} finally {
// As this deprecated callback, might not be
// defined; continue
}
}
if (Flags.leaudioMultipleVocsInstancesApi()) {
if (isRegisterCallbackRequired) {
service.registerCallback(mCallback, mAttributionSource, recv);
} else {
service.notifyNewRegisteredCallback(
new IBluetoothVolumeControlCallback.Stub() {
@Override
public void onVolumeOffsetChanged(
BluetoothDevice device, int instanceId, int volumeOffset)
throws RemoteException {
Attributable.setAttributionSource(device, mAttributionSource);
// The old API operates on the first instance only
if (instanceId == 1) {
try {
executor.execute(
() ->
callback.onVolumeOffsetChanged(
device,
instanceId,
volumeOffset));
device, volumeOffset));
} finally {
// As this deprecated callback, might not be
// defined; continue
}
}
@Override
public void onVolumeOffsetAudioLocationChanged(
BluetoothDevice device, int instanceId, int location)
throws RemoteException {
if (Flags.leaudioMultipleVocsInstancesApi()) {
Attributable.setAttributionSource(
device, mAttributionSource);
executor.execute(
() ->
callback
.onVolumeOffsetAudioLocationChanged(
device,
instanceId,
location));
}
if (Flags.leaudioMultipleVocsInstancesApi()) {
executor.execute(
() ->
callback.onVolumeOffsetChanged(
device, instanceId, volumeOffset));
}
}
@Override
public void onVolumeOffsetAudioDescriptionChanged(
BluetoothDevice device,
int instanceId,
String audioDescription)
throws RemoteException {
if (Flags.leaudioMultipleVocsInstancesApi()) {
Attributable.setAttributionSource(
device, mAttributionSource);
executor.execute(
() ->
callback
.onVolumeOffsetAudioDescriptionChanged(
device,
instanceId,
audioDescription));
}
@Override
public void onVolumeOffsetAudioLocationChanged(
BluetoothDevice device, int instanceId, int location)
throws RemoteException {
if (Flags.leaudioMultipleVocsInstancesApi()) {
Attributable.setAttributionSource(
device, mAttributionSource);
executor.execute(
() ->
callback.onVolumeOffsetAudioLocationChanged(
device, instanceId, location));
}
@Override
public void onDeviceVolumeChanged(
BluetoothDevice device, int volume)
throws RemoteException {
}
@Override
public void onVolumeOffsetAudioDescriptionChanged(
BluetoothDevice device,
int instanceId,
String audioDescription)
throws RemoteException {
if (Flags.leaudioMultipleVocsInstancesApi()) {
Attributable.setAttributionSource(
device, mAttributionSource);
executor.execute(
() ->
callback.onDeviceVolumeChanged(
device, volume));
callback
.onVolumeOffsetAudioDescriptionChanged(
device,
instanceId,
audioDescription));
}
},
mAttributionSource,
recv);
}
recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);
}
@Override
public void onDeviceVolumeChanged(
BluetoothDevice device, int volume) throws RemoteException {
Attributable.setAttributionSource(device, mAttributionSource);
executor.execute(
() -> callback.onDeviceVolumeChanged(device, volume));
}
},
mAttributionSource,
recv);
}
recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);
} catch (RemoteException e) {
mCallbackExecutorMap.remove(callback);
Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment