diff options
| author | Neha Jain <jainne@google.com> | 2022-06-29 23:53:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-30 02:24:28 +0000 |
| commit | 856f6acf59076eb3b200b1581d178745c9f0e681 (patch) | |
| tree | 015aab1ce91e4148f0c851baa4681b01d9aea25c /framework/java | |
| parent | 4c024a2dee95a9c9f94e8c4616e6aa9cdb5aa2a5 (diff) | |
Revert "Revert "Reuse SynchronousResultReceivers instead of creating new.""
This reverts commit dd85e91cea26c7f706af36c852e79d5b4ca1f173.
Bug: 217366135
Reason for revert: Need this to fix a crash bug in tm-dev
Change-Id: I2a94c278edc0681c5b8af6ea0a0171b71d72c650
(cherry picked from commit dbaf406ccb0ed887d4e93057c9ec0d3457f14457)
Merged-In: I2a94c278edc0681c5b8af6ea0a0171b71d72c650
Diffstat (limited to 'framework/java')
27 files changed, 372 insertions, 372 deletions
diff --git a/framework/java/android/bluetooth/BluetoothA2dp.java b/framework/java/android/bluetooth/BluetoothA2dp.java index a3dece72b3..c1d4fa7492 100644 --- a/framework/java/android/bluetooth/BluetoothA2dp.java +++ b/framework/java/android/bluetooth/BluetoothA2dp.java @@ -336,7 +336,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connectWithAttribution(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -382,7 +382,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnectWithAttribution(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -408,7 +408,7 @@ public final class BluetoothA2dp implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevicesWithAttribution(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -436,7 +436,7 @@ public final class BluetoothA2dp implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStatesWithAttribution(states, mAttributionSource, recv); return Attributable.setAttributionSource( @@ -464,7 +464,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionStateWithAttribution(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -506,7 +506,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && ((device == null) || isValidDevice(device))) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setActiveDevice(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -538,7 +538,7 @@ public final class BluetoothA2dp implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<BluetoothDevice> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getActiveDevice(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -601,7 +601,7 @@ public final class BluetoothA2dp implements BluetoothProfile { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -656,7 +656,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -682,7 +682,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isAvrcpAbsoluteVolumeSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -736,7 +736,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isA2dpPlaying(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -795,7 +795,7 @@ public final class BluetoothA2dp implements BluetoothProfile { } else if (isEnabled() && isValidDevice(device)) { try { final SynchronousResultReceiver<BluetoothCodecStatus> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getCodecStatus(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -952,7 +952,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.isOptionalCodecsSupported(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -989,7 +989,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.isOptionalCodecsEnabled(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1065,7 +1065,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getDynamicBufferSupport(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1101,7 +1101,7 @@ public final class BluetoothA2dp implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<BufferConstraints> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getBufferConstraints(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1140,7 +1140,7 @@ public final class BluetoothA2dp implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setBufferLengthMillis(codec, value, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothA2dpSink.java b/framework/java/android/bluetooth/BluetoothA2dpSink.java index 59416818ce..67042decc9 100755 --- a/framework/java/android/bluetooth/BluetoothA2dpSink.java +++ b/framework/java/android/bluetooth/BluetoothA2dpSink.java @@ -150,7 +150,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -195,7 +195,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -223,7 +223,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -253,7 +253,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -282,7 +282,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -316,7 +316,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { } else if (isEnabled() && isValidDevice(device)) { try { final SynchronousResultReceiver<BluetoothAudioConfig> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getAudioConfig(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -377,7 +377,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -433,7 +433,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -466,7 +466,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isA2dpPlaying(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 0fdadf85eb..0cd9254618 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -1276,7 +1276,7 @@ public final class BluetoothAdapter { @Override public @InternalAdapterState Integer apply(IBluetooth serviceQuery) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); serviceQuery.getState(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothAdapter.STATE_OFF); @@ -1561,7 +1561,7 @@ public final class BluetoothAdapter { @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public int getNameLengthForAdvertise() { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.getNameLengthForAdvertise(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(-1); } catch (RemoteException | TimeoutException e) { @@ -1586,7 +1586,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.factoryReset(mAttributionSource, recv); if (recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false) && mManagerService != null @@ -1651,7 +1651,7 @@ public final class BluetoothAdapter { mServiceLock.readLock().lock(); try { final SynchronousResultReceiver<List<ParcelUuid>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.getUuids(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1686,7 +1686,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.setName(name, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -1717,7 +1717,7 @@ public final class BluetoothAdapter { mServiceLock.readLock().lock(); if (mService != null) { final SynchronousResultReceiver<BluetoothClass> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.getBluetoothClass(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -1752,7 +1752,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.setBluetoothClass(bluetoothClass, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -1783,7 +1783,7 @@ public final class BluetoothAdapter { mServiceLock.readLock().lock(); if (mService != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.getIoCapability(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothAdapter.IO_CAPABILITY_UNKNOWN); @@ -1819,7 +1819,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.setIoCapability(capability, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -1849,7 +1849,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.getLeIoCapability(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothAdapter.IO_CAPABILITY_UNKNOWN); @@ -1885,7 +1885,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.setLeIoCapability(capability, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -1923,7 +1923,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.getScanMode(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(SCAN_MODE_NONE); } @@ -1972,7 +1972,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.setScanMode(mode, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothStatusCodes.ERROR_UNKNOWN); @@ -2001,7 +2001,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Long> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Long> recv = SynchronousResultReceiver.get(); mService.getDiscoverableTimeout(mAttributionSource, recv); long timeout = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue((long) -1); return (timeout == -1) ? null : Duration.ofSeconds(timeout); @@ -2048,7 +2048,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.setDiscoverableTimeout(timeout.toSeconds(), mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothStatusCodes.ERROR_UNKNOWN); @@ -2081,7 +2081,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Long> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Long> recv = SynchronousResultReceiver.get(); mService.getDiscoveryEndMillis(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue((long) -1); } @@ -2134,7 +2134,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.startDiscovery(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2172,7 +2172,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.cancelDiscovery(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2212,7 +2212,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.isDiscovering(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2257,7 +2257,7 @@ public final class BluetoothAdapter { mServiceLock.readLock().lock(); if (mService != null) { if (DBG) Log.d(TAG, "removeActiveDevice, profiles: " + profiles); - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.removeActiveDevice(profiles, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2311,7 +2311,7 @@ public final class BluetoothAdapter { if (DBG) { Log.d(TAG, "setActiveDevice, device: " + device + ", profiles: " + profiles); } - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.setActiveDevice(device, profiles, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2362,7 +2362,7 @@ public final class BluetoothAdapter { + BluetoothProfile.getProfileName(profile) + ")"); } final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.getActiveDevices(profile, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(new ArrayList<>()); } @@ -2389,7 +2389,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.isMultiAdvertisementSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2429,7 +2429,7 @@ public final class BluetoothAdapter { @Override public Boolean apply(IBluetooth serviceQuery) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); serviceQuery.isOffloadedFilteringSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } catch (RemoteException | TimeoutException e) { @@ -2493,7 +2493,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.isOffloadedScanBatchingSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2519,7 +2519,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.isLe2MPhySupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2545,7 +2545,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.isLeCodedPhySupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2571,7 +2571,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.isLeExtendedAdvertisingSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2597,7 +2597,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.isLePeriodicAdvertisingSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } @@ -2635,7 +2635,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.isLeAudioSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothStatusCodes.ERROR_UNKNOWN); @@ -2669,7 +2669,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.isLeAudioBroadcastSourceSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothStatusCodes.ERROR_UNKNOWN); @@ -2704,7 +2704,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.isLeAudioBroadcastAssistantSupported(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothStatusCodes.ERROR_UNKNOWN); @@ -2737,7 +2737,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.getLeMaximumAdvertisingDataLength(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(0); } @@ -2777,7 +2777,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.getMaxConnectedAudioDevices(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(1); } @@ -2807,7 +2807,7 @@ public final class BluetoothAdapter { // BLE is not supported return false; } - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); iGatt.numHwTrackFiltersAvailable(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(0) != 0; } catch (TimeoutException | RemoteException e) { @@ -2883,7 +2883,7 @@ public final class BluetoothAdapter { mServiceLock.readLock().lock(); if (mService != null) { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.getMostRecentlyConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(new ArrayList<>()), @@ -2918,7 +2918,7 @@ public final class BluetoothAdapter { mServiceLock.readLock().lock(); if (mService != null) { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.getBondedDevices(mAttributionSource, recv); return toDeviceSet(Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(new ArrayList<>()), @@ -2955,7 +2955,7 @@ public final class BluetoothAdapter { try { synchronized (mManagerCallback) { if (mService != null) { - final SynchronousResultReceiver<Long> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Long> recv = SynchronousResultReceiver.get(); mService.getSupportedProfiles(mAttributionSource, recv); final long supportedProfilesBitMask = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue((long) 0); @@ -2986,7 +2986,7 @@ public final class BluetoothAdapter { public Integer apply(IBluetooth serviceQuery) { try { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); serviceQuery.getAdapterConnectionState(recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(STATE_DISCONNECTED); @@ -3052,7 +3052,7 @@ public final class BluetoothAdapter { final int defaultValue = STATE_DISCONNECTED; try { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); pairQuery.first.getProfileConnectionState(pairQuery.second, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -3243,7 +3243,7 @@ public final class BluetoothAdapter { throw new IllegalArgumentException("The provided PendingIntent is not immutable"); } try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.startRfcommListener( name, new ParcelUuid(uuid), pendingIntent, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) @@ -3272,7 +3272,7 @@ public final class BluetoothAdapter { @RfcommListenerResult public int stopRfcommServer(@NonNull UUID uuid) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.stopRfcommListener(new ParcelUuid(uuid), mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND); @@ -3308,7 +3308,7 @@ public final class BluetoothAdapter { try { final SynchronousResultReceiver<IncomingRfcommSocketInfo> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.retrievePendingSocketForServiceRecord(new ParcelUuid(uuid), mAttributionSource, recv); socketInfo = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -3874,7 +3874,7 @@ public final class BluetoothAdapter { mMetadataListeners.forEach((device, pair) -> { try { final SynchronousResultReceiver recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.registerMetadataListener(mBluetoothMetadataListener, device, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -3889,7 +3889,7 @@ public final class BluetoothAdapter { if (!mBluetoothConnectionCallbackExecutorMap.isEmpty()) { try { final SynchronousResultReceiver recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.registerBluetoothConnectionCallback(mConnectionCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -4078,7 +4078,7 @@ public final class BluetoothAdapter { callback.onError(BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED); } else { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.generateLocalOobData(transport, new WrappedOobDataCallback(callback, executor), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -4681,7 +4681,7 @@ public final class BluetoothAdapter { boolean ret = false; try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.registerMetadataListener(mBluetoothMetadataListener, device, mAttributionSource, recv); ret = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); @@ -4749,7 +4749,7 @@ public final class BluetoothAdapter { return true; } try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.unregisterMetadataListener(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); } catch (RemoteException | TimeoutException e) { @@ -4835,7 +4835,7 @@ public final class BluetoothAdapter { mServiceLock.readLock().lock(); if (mService != null) { final SynchronousResultReceiver<Boolean> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.registerBluetoothConnectionCallback(mConnectionCallback, mAttributionSource, recv); if (!recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false)) { @@ -4894,7 +4894,7 @@ public final class BluetoothAdapter { try { mServiceLock.readLock().lock(); if (mService != null) { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); mService.unregisterBluetoothConnectionCallback(mConnectionCallback, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false); diff --git a/framework/java/android/bluetooth/BluetoothAvrcpController.java b/framework/java/android/bluetooth/BluetoothAvrcpController.java index 81fc3e11e9..81ad3c6ee7 100644 --- a/framework/java/android/bluetooth/BluetoothAvrcpController.java +++ b/framework/java/android/bluetooth/BluetoothAvrcpController.java @@ -141,7 +141,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -169,7 +169,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -196,7 +196,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -224,7 +224,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<BluetoothAvrcpPlayerSettings> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getPlayerSettings(device, mAttributionSource, recv); settings = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -249,7 +249,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setPlayerApplicationSetting(plAppSetting, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -274,7 +274,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.sendGroupNavigationCmd(device, keyCode, keyState, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); return; diff --git a/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java b/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java index 16e899dced..0c5ebea608 100644 --- a/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java +++ b/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java @@ -278,7 +278,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto IBluetoothCsipSetCoordinatorLockCallback delegate = new BluetoothCsipSetCoordinatorLockCallbackDelegate(executor, callback); try { - final SynchronousResultReceiver<ParcelUuid> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<ParcelUuid> recv = SynchronousResultReceiver.get(); service.lockGroup(groupId, delegate, mAttributionSource, recv); final ParcelUuid ret = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); return ret == null ? defaultValue : ret.getUuid(); @@ -311,7 +311,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.unlockGroup(new ParcelUuid(lockUuid), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); return true; @@ -343,7 +343,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Map> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Map> recv = SynchronousResultReceiver.get(); service.getGroupUuidMapByDevice(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -374,7 +374,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto } else if (isEnabled()) { try { final SynchronousResultReceiver<List<Integer>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getAllGroupIds(uuid, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -400,7 +400,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -427,7 +427,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -453,7 +453,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -492,7 +492,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -527,7 +527,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index 6618a55184..5c91c9480b 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -1494,7 +1494,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { Log.e(TAG, "BT not enabled. Cannot get identity address"); } else { try { - final SynchronousResultReceiver<String> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<String> recv = SynchronousResultReceiver.get(); service.getIdentityAddress(mAddress, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1525,7 +1525,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<String> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<String> recv = SynchronousResultReceiver.get(); service.getRemoteName(this, mAttributionSource, recv); String name = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); if (name != null) { @@ -1560,7 +1560,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getRemoteType(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1589,7 +1589,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<String> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<String> recv = SynchronousResultReceiver.get(); service.getRemoteAliasWithAttribution(this, mAttributionSource, recv); String alias = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); if (alias == null) { @@ -1650,7 +1650,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.setRemoteAlias(this, alias, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -1684,7 +1684,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getBatteryLevel(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1781,7 +1781,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { Log.e(TAG, "Unable to create bond, invalid address " + mAddress); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.createBond(this, transport, remoteP192Data, remoteP256Data, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); @@ -1812,7 +1812,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isBondingInitiatedLocally(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1842,7 +1842,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { + " called by pid: " + Process.myPid() + " tid: " + Process.myTid()); try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.cancelBondProcess(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1875,7 +1875,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { + " called by pid: " + Process.myPid() + " tid: " + Process.myTid()); try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.removeBond(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1916,7 +1916,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { } try { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); pairQuery.first.getBondState(pairQuery.second, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(BOND_NONE); } catch (RemoteException | TimeoutException e) { @@ -1995,7 +1995,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.canBondWithoutDialog(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2049,7 +2049,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.connectAllEnabledProfiles(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -2096,7 +2096,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.disconnectAllEnabledProfiles(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -2128,7 +2128,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionStateWithAttribution(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue) != CONNECTION_STATE_DISCONNECTED; @@ -2160,7 +2160,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionStateWithAttribution(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue) > CONNECTION_STATE_CONNECTED; @@ -2189,7 +2189,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getRemoteClass(this, mAttributionSource, recv); int classInt = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); if (classInt == BluetoothClass.ERROR) return null; @@ -2224,7 +2224,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { } else { try { final SynchronousResultReceiver<List<ParcelUuid>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getRemoteUuids(this, mAttributionSource, recv); List<ParcelUuid> parcels = recv.awaitResultNoInterrupt(getSyncTimeout()) .getValue(null); @@ -2290,7 +2290,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.fetchRemoteUuidsWithAttribution(this, transport, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2332,7 +2332,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.sdpSearch(this, uuid, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2359,7 +2359,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setPin(this, true, pin.length, pin, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2405,7 +2405,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setPairingConfirmation(this, confirm, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2444,7 +2444,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getPhonebookAccessPermission(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2490,7 +2490,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { throw new IllegalStateException("Bluetooth is not turned ON"); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setSilenceMode(this, silence, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2520,7 +2520,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { throw new IllegalStateException("Bluetooth is not turned ON"); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.getSilenceMode(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2552,7 +2552,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setPhonebookAccessPermission(this, value, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2581,7 +2581,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getMessageAccessPermission(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2618,7 +2618,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setMessageAccessPermission(this, value, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2647,7 +2647,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getSimAccessPermission(this, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -2680,7 +2680,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setSimAccessPermission(this, value, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -3194,7 +3194,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { + ", should not over " + METADATA_MAX_LENGTH); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setMetadata(this, key, value, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -3226,7 +3226,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<byte[]> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<byte[]> recv = SynchronousResultReceiver.get(); service.getMetadata(this, key, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -3269,7 +3269,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.allowLowLatencyAudio(allowed, this, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothGatt.java b/framework/java/android/bluetooth/BluetoothGatt.java index ee9c691134..068188c92e 100644 --- a/framework/java/android/bluetooth/BluetoothGatt.java +++ b/framework/java/android/bluetooth/BluetoothGatt.java @@ -214,7 +214,7 @@ public final class BluetoothGatt implements BluetoothProfile { return; } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); // autoConnect is inverse of "isDirect" mService.clientConnect(mClientIf, mDevice.getAddress(), !mAutoConnect, mTransport, mOpportunistic, mPhy, mAttributionSource, recv); @@ -396,7 +396,7 @@ public final class BluetoothGatt implements BluetoothProfile { try { final int authReq = (mAuthRetryState == AUTH_RETRY_STATE_IDLE) ? AUTHENTICATION_NO_MITM : AUTHENTICATION_MITM; - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.readCharacteristic( mClientIf, address, handle, authReq, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -464,7 +464,7 @@ public final class BluetoothGatt implements BluetoothProfile { int requestStatus = BluetoothStatusCodes.ERROR_UNKNOWN; for (int i = 0; i < WRITE_CHARACTERISTIC_MAX_RETRIES; i++) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); mService.writeCharacteristic(mClientIf, address, handle, characteristic.getWriteType(), authReq, value, mAttributionSource, recv); @@ -559,7 +559,7 @@ public final class BluetoothGatt implements BluetoothProfile { try { final int authReq = (mAuthRetryState == AUTH_RETRY_STATE_IDLE) ? AUTHENTICATION_NO_MITM : AUTHENTICATION_MITM; - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.readDescriptor(mClientIf, address, handle, authReq, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -615,7 +615,7 @@ public final class BluetoothGatt implements BluetoothProfile { try { final int authReq = (mAuthRetryState == AUTH_RETRY_STATE_IDLE) ? AUTHENTICATION_NO_MITM : AUTHENTICATION_MITM; - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.writeDescriptor(mClientIf, address, handle, authReq, value, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -913,7 +913,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (DBG) Log.d(TAG, "registerApp() - UUID=" + uuid); try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.registerClient(new ParcelUuid(uuid), mBluetoothGattCallback, eatt_support, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -937,7 +937,7 @@ public final class BluetoothGatt implements BluetoothProfile { try { mCallback = null; - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.unregisterClient(mClientIf, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); mClientIf = 0; @@ -1009,7 +1009,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (mService == null || mClientIf == 0) return; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.clientDisconnect(mClientIf, mDevice.getAddress(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1031,7 +1031,7 @@ public final class BluetoothGatt implements BluetoothProfile { public boolean connect() { try { // autoConnect is inverse of "isDirect" - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.clientConnect(mClientIf, mDevice.getAddress(), false, mTransport, mOpportunistic, mPhy, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1064,7 +1064,7 @@ public final class BluetoothGatt implements BluetoothProfile { @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void setPreferredPhy(int txPhy, int rxPhy, int phyOptions) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.clientSetPreferredPhy(mClientIf, mDevice.getAddress(), txPhy, rxPhy, phyOptions, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1081,7 +1081,7 @@ public final class BluetoothGatt implements BluetoothProfile { @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void readPhy() { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.clientReadPhy(mClientIf, mDevice.getAddress(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1120,7 +1120,7 @@ public final class BluetoothGatt implements BluetoothProfile { mServices.clear(); try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.discoverServices(mClientIf, mDevice.getAddress(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1149,7 +1149,7 @@ public final class BluetoothGatt implements BluetoothProfile { mServices.clear(); try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.discoverServiceByUuid(mClientIf, mDevice.getAddress(), new ParcelUuid(uuid), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1243,7 +1243,7 @@ public final class BluetoothGatt implements BluetoothProfile { } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.readCharacteristic(mClientIf, device.getAddress(), characteristic.getInstanceId(), AUTHENTICATION_NONE, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1282,7 +1282,7 @@ public final class BluetoothGatt implements BluetoothProfile { } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.readUsingCharacteristicUuid(mClientIf, mDevice.getAddress(), new ParcelUuid(uuid), startHandle, endHandle, AUTHENTICATION_NONE, mAttributionSource, recv); @@ -1391,7 +1391,7 @@ public final class BluetoothGatt implements BluetoothProfile { int requestStatus = BluetoothStatusCodes.ERROR_UNKNOWN; try { for (int i = 0; i < WRITE_CHARACTERISTIC_MAX_RETRIES; i++) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.writeCharacteristic(mClientIf, device.getAddress(), characteristic.getInstanceId(), writeType, AUTHENTICATION_NONE, value, mAttributionSource, recv); @@ -1453,7 +1453,7 @@ public final class BluetoothGatt implements BluetoothProfile { } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.readDescriptor(mClientIf, device.getAddress(), descriptor.getInstanceId(), AUTHENTICATION_NONE, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1542,7 +1542,7 @@ public final class BluetoothGatt implements BluetoothProfile { } try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.writeDescriptor(mClientIf, device.getAddress(), descriptor.getInstanceId(), AUTHENTICATION_NONE, value, mAttributionSource, recv); @@ -1589,7 +1589,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (mService == null || mClientIf == 0) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.beginReliableWrite(mClientIf, mDevice.getAddress(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1624,7 +1624,7 @@ public final class BluetoothGatt implements BluetoothProfile { } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.endReliableWrite(mClientIf, mDevice.getAddress(), true, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1653,7 +1653,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (mService == null || mClientIf == 0) return; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.endReliableWrite(mClientIf, mDevice.getAddress(), false, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1702,7 +1702,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (device == null) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.registerForNotification(mClientIf, device.getAddress(), characteristic.getInstanceId(), enable, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1728,7 +1728,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (mService == null || mClientIf == 0) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.refreshDevice(mClientIf, mDevice.getAddress(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1755,7 +1755,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (mService == null || mClientIf == 0) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.readRemoteRssi(mClientIf, mDevice.getAddress(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1789,7 +1789,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (mService == null || mClientIf == 0) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.configureMTU(mClientIf, mDevice.getAddress(), mtu, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1823,7 +1823,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (mService == null || mClientIf == 0) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.connectionParameterUpdate(mClientIf, mDevice.getAddress(), connectionPriority, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1859,7 +1859,7 @@ public final class BluetoothGatt implements BluetoothProfile { if (mService == null || mClientIf == 0) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.leConnectionUpdate(mClientIf, mDevice.getAddress(), minConnectionInterval, maxConnectionInterval, slaveLatency, supervisionTimeout, diff --git a/framework/java/android/bluetooth/BluetoothGattServer.java b/framework/java/android/bluetooth/BluetoothGattServer.java index 8b84505e36..d652bd8476 100644 --- a/framework/java/android/bluetooth/BluetoothGattServer.java +++ b/framework/java/android/bluetooth/BluetoothGattServer.java @@ -502,7 +502,7 @@ public final class BluetoothGattServer implements BluetoothProfile { mCallback = callback; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.registerServer(new ParcelUuid(uuid), mBluetoothGattServerCallback, eatt_support, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -539,7 +539,7 @@ public final class BluetoothGattServer implements BluetoothProfile { try { mCallback = null; - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.unregisterServer(mServerIf, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); mServerIf = 0; @@ -595,7 +595,7 @@ public final class BluetoothGattServer implements BluetoothProfile { try { // autoConnect is inverse of "isDirect" - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.serverConnect(mServerIf, device.getAddress(), !autoConnect, mTransport, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -621,7 +621,7 @@ public final class BluetoothGattServer implements BluetoothProfile { if (mService == null || mServerIf == 0) return; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.serverDisconnect(mServerIf, device.getAddress(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -651,7 +651,7 @@ public final class BluetoothGattServer implements BluetoothProfile { @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void setPreferredPhy(BluetoothDevice device, int txPhy, int rxPhy, int phyOptions) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.serverSetPreferredPhy(mServerIf, device.getAddress(), txPhy, rxPhy, phyOptions, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -670,7 +670,7 @@ public final class BluetoothGattServer implements BluetoothProfile { @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void readPhy(BluetoothDevice device) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.serverReadPhy(mServerIf, device.getAddress(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -706,7 +706,7 @@ public final class BluetoothGattServer implements BluetoothProfile { if (mService == null || mServerIf == 0) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.sendResponse(mServerIf, device.getAddress(), requestId, status, offset, value, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -801,7 +801,7 @@ public final class BluetoothGattServer implements BluetoothProfile { } try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); mService.sendNotification(mServerIf, device.getAddress(), characteristic.getInstanceId(), confirm, value, mAttributionSource, recv); @@ -842,7 +842,7 @@ public final class BluetoothGattServer implements BluetoothProfile { mPendingService = service; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.addService(mServerIf, service, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -871,7 +871,7 @@ public final class BluetoothGattServer implements BluetoothProfile { if (intService == null) return false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.removeService(mServerIf, service.getInstanceId(), mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); mServices.remove(intService); @@ -894,7 +894,7 @@ public final class BluetoothGattServer implements BluetoothProfile { if (mService == null || mServerIf == 0) return; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.clearServices(mServerIf, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); mServices.clear(); diff --git a/framework/java/android/bluetooth/BluetoothHapClient.java b/framework/java/android/bluetooth/BluetoothHapClient.java index 1d51670ffe..08d07ff5f8 100644 --- a/framework/java/android/bluetooth/BluetoothHapClient.java +++ b/framework/java/android/bluetooth/BluetoothHapClient.java @@ -446,7 +446,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable final IBluetoothHapClient service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.registerCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -558,7 +558,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable final IBluetoothHapClient service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.registerCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -611,7 +611,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable try { final IBluetoothHapClient service = getService(); if (service != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.unregisterCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -654,7 +654,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -693,7 +693,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -725,7 +725,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<List> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<List> recv = SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -760,7 +760,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<List> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<List> recv = SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -795,7 +795,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -837,7 +837,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getHapGroup(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -869,7 +869,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getActivePresetIndex(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -904,7 +904,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable } else if (isEnabled() && isValidDevice(device)) { try { final SynchronousResultReceiver<BluetoothHapPresetInfo> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getActivePresetInfo(device, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -1123,7 +1123,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable } else if (isEnabled() && isValidDevice(device)) { try { final SynchronousResultReceiver<BluetoothHapPresetInfo> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getPresetInfo(device, presetIndex, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -1157,7 +1157,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable } else if (isEnabled() && isValidDevice(device)) { try { final SynchronousResultReceiver<List<BluetoothHapPresetInfo>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getAllPresetInfo(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -1189,7 +1189,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getFeatures(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothHeadset.java b/framework/java/android/bluetooth/BluetoothHeadset.java index 434542a5e9..dcf0ab78e0 100644 --- a/framework/java/android/bluetooth/BluetoothHeadset.java +++ b/framework/java/android/bluetooth/BluetoothHeadset.java @@ -494,7 +494,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connectWithAttribution(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -539,7 +539,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnectWithAttribution(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -565,7 +565,7 @@ public final class BluetoothHeadset implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevicesWithAttribution(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -593,7 +593,7 @@ public final class BluetoothHeadset implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -620,7 +620,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionStateWithAttribution(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -661,7 +661,7 @@ public final class BluetoothHeadset implements BluetoothProfile { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -717,7 +717,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -745,7 +745,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isNoiseReductionSupported(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -773,7 +773,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isVoiceRecognitionSupported(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -817,7 +817,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.startVoiceRecognition(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -851,7 +851,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.stopVoiceRecognition(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -879,7 +879,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isAudioConnected(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -925,7 +925,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (!isDisabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getAudioState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -988,7 +988,7 @@ public final class BluetoothHeadset implements BluetoothProfile { return BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND; } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.setAudioRouteAllowed(allowed, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); return BluetoothStatusCodes.SUCCESS; @@ -1028,7 +1028,7 @@ public final class BluetoothHeadset implements BluetoothProfile { return BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND; } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.getAudioRouteAllowed(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(false) ? BluetoothStatusCodes.ALLOWED : BluetoothStatusCodes.NOT_ALLOWED; @@ -1062,7 +1062,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.setForceScoAudio(forced, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1117,7 +1117,7 @@ public final class BluetoothHeadset implements BluetoothProfile { return BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND; } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.connectAudio(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -1172,7 +1172,7 @@ public final class BluetoothHeadset implements BluetoothProfile { return BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND; } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.disconnectAudio(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -1226,7 +1226,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.startScoUsingVirtualVoiceCall(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1265,7 +1265,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.stopScoUsingVirtualVoiceCall(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1323,7 +1323,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.clccResponse(index, direction, status, mode, mpty, number, type, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -1367,7 +1367,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.sendVendorSpecificResultCode(device, command, arg, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); @@ -1415,7 +1415,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && (device == null || isValidDevice(device))) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setActiveDevice(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1447,7 +1447,7 @@ public final class BluetoothHeadset implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<BluetoothDevice> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getActiveDevice(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -1482,7 +1482,7 @@ public final class BluetoothHeadset implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isInbandRingingEnabled(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothHeadsetClient.java b/framework/java/android/bluetooth/BluetoothHeadsetClient.java index d47e41a0b1..1e78f681d5 100644 --- a/framework/java/android/bluetooth/BluetoothHeadsetClient.java +++ b/framework/java/android/bluetooth/BluetoothHeadsetClient.java @@ -804,7 +804,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -835,7 +835,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -866,7 +866,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -903,7 +903,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -938,7 +938,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -999,7 +999,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -1057,7 +1057,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -1094,7 +1094,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.startVoiceRecognition(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1126,7 +1126,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.sendVendorAtCommand(device, vendorId, atCommand, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1160,7 +1160,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.stopVoiceRecognition(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1190,7 +1190,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose } else if (isEnabled() && isValidDevice(device)) { try { final SynchronousResultReceiver<List<BluetoothHeadsetClientCall>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getCurrentCalls(device, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -1221,7 +1221,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Bundle> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Bundle> recv = SynchronousResultReceiver.get(); service.getCurrentAgEvents(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1254,7 +1254,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.acceptCall(device, flag, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1284,7 +1284,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.holdCall(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1319,7 +1319,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.rejectCall(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1358,7 +1358,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.terminateCall(device, call, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1395,7 +1395,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.enterPrivateMode(device, index, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1431,7 +1431,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.explicitCallTransfer(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1464,7 +1464,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose } else if (isEnabled() && isValidDevice(device)) { try { final SynchronousResultReceiver<BluetoothHeadsetClientCall> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.dial(device, number, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -1499,7 +1499,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.sendDTMF(device, code, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1534,7 +1534,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.getLastVoiceTagNumber(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1563,7 +1563,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getAudioState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1594,7 +1594,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.setAudioRouteAllowed(device, allowed, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1623,7 +1623,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.getAudioRouteAllowed(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1655,7 +1655,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connectAudio(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1687,7 +1687,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnectAudio(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1716,7 +1716,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Bundle> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Bundle> recv = SynchronousResultReceiver.get(); service.getCurrentAgFeatures(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothHearingAid.java b/framework/java/android/bluetooth/BluetoothHearingAid.java index 3fd011f956..130105d166 100644 --- a/framework/java/android/bluetooth/BluetoothHearingAid.java +++ b/framework/java/android/bluetooth/BluetoothHearingAid.java @@ -194,7 +194,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -240,7 +240,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -266,7 +266,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -295,7 +295,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -323,7 +323,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -365,7 +365,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && ((device == null) || isValidDevice(device))) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setActiveDevice(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -397,7 +397,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getActiveDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -461,7 +461,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -518,7 +518,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -570,7 +570,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.setVolume(volume, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -605,7 +605,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Long> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Long> recv = SynchronousResultReceiver.get(); service.getHiSyncId(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -634,7 +634,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getDeviceSide(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -663,7 +663,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getDeviceMode(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothHidDevice.java b/framework/java/android/bluetooth/BluetoothHidDevice.java index 44a355b5f7..46613f75fe 100644 --- a/framework/java/android/bluetooth/BluetoothHidDevice.java +++ b/framework/java/android/bluetooth/BluetoothHidDevice.java @@ -466,7 +466,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -491,7 +491,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -515,7 +515,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -577,7 +577,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); CallbackWrapper cbw = new CallbackWrapper(executor, callback, mAttributionSource); service.registerApp(sdp, inQos, outQos, cbw, mAttributionSource, recv); result = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); @@ -608,7 +608,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.unregisterApp(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -636,7 +636,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.sendReport(device, id, data, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -665,7 +665,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.replyReport(device, type, id, data, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -692,7 +692,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.reportError(device, error, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -718,7 +718,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<String> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<String> recv = SynchronousResultReceiver.get(); service.getUserAppName(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -746,7 +746,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -773,7 +773,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -818,7 +818,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothHidHost.java b/framework/java/android/bluetooth/BluetoothHidHost.java index ecbeddf2b8..73c3ca829b 100644 --- a/framework/java/android/bluetooth/BluetoothHidHost.java +++ b/framework/java/android/bluetooth/BluetoothHidHost.java @@ -302,7 +302,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -348,7 +348,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -377,7 +377,7 @@ public final class BluetoothHidHost implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -407,7 +407,7 @@ public final class BluetoothHidHost implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -440,7 +440,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -504,7 +504,7 @@ public final class BluetoothHidHost implements BluetoothProfile { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -563,7 +563,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -600,7 +600,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.virtualUnplug(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -629,7 +629,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.getProtocolMode(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -658,7 +658,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setProtocolMode(device, protocolMode, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -694,7 +694,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.getReport(device, reportType, reportId, bufferSize, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); @@ -726,7 +726,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setReport(device, reportType, report, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -756,7 +756,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.sendData(device, report, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -785,7 +785,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.getIdleTime(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -815,7 +815,7 @@ public final class BluetoothHidHost implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setIdleTime(device, idleTime, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothLeAudio.java b/framework/java/android/bluetooth/BluetoothLeAudio.java index 6d9fa07d51..ea39b64a76 100644 --- a/framework/java/android/bluetooth/BluetoothLeAudio.java +++ b/framework/java/android/bluetooth/BluetoothLeAudio.java @@ -646,7 +646,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { final IBluetoothLeAudio service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.registerCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()) @@ -739,7 +739,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -783,7 +783,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -822,7 +822,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { } else if (mAdapter.isEnabled()) { try { final SynchronousResultReceiver<BluetoothDevice> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedGroupLeadDevice(groupId, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -850,7 +850,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { } else if (mAdapter.isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -879,7 +879,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { } else if (mAdapter.isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -907,7 +907,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -962,7 +962,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { final IBluetoothLeAudio service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.registerCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -1014,7 +1014,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { try { final IBluetoothLeAudio service = getService(); if (service != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.unregisterCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -1057,7 +1057,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled() && ((device == null) || isValidDevice(device))) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setActiveDevice(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1087,7 +1087,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { } else if (mAdapter.isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getActiveDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -1118,7 +1118,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getGroupId(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1148,7 +1148,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.setVolume(volume, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -1178,7 +1178,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.groupAddNode(group_id, device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1210,7 +1210,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.groupRemoveNode(group_id, device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1248,7 +1248,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getAudioLocation(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultLocation); } catch (RemoteException | TimeoutException e) { @@ -1288,7 +1288,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1324,7 +1324,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (mAdapter.isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -1396,7 +1396,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { } else if (mAdapter.isEnabled()) { try { final SynchronousResultReceiver<BluetoothLeAudioCodecStatus> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getCodecStatus(groupId, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothLeBroadcast.java b/framework/java/android/bluetooth/BluetoothLeBroadcast.java index 3cdf2cd129..5db7ea23a6 100644 --- a/framework/java/android/bluetooth/BluetoothLeBroadcast.java +++ b/framework/java/android/bluetooth/BluetoothLeBroadcast.java @@ -183,7 +183,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi final IBluetoothLeAudio service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.registerLeBroadcastCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()) @@ -442,7 +442,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi final IBluetoothLeAudio service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.registerLeBroadcastCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -495,7 +495,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi try { final IBluetoothLeAudio service = getService(); if (service != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.unregisterLeBroadcastCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -662,7 +662,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isPlaying(broadcastId, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -696,7 +696,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothLeBroadcastMetadata>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getAllBroadcastMetadata(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { @@ -723,7 +723,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getMaximumNumberOfBroadcasts(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothManager.java b/framework/java/android/bluetooth/BluetoothManager.java index 7ab32f3dfb..3fcb58a21a 100644 --- a/framework/java/android/bluetooth/BluetoothManager.java +++ b/framework/java/android/bluetooth/BluetoothManager.java @@ -172,7 +172,7 @@ public final class BluetoothManager { IBluetoothGatt iGatt = managerService.getBluetoothGatt(); if (iGatt == null) return devices; final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); iGatt.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); devices = Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(devices), diff --git a/framework/java/android/bluetooth/BluetoothMap.java b/framework/java/android/bluetooth/BluetoothMap.java index a8b48348da..2d4bc568ca 100644 --- a/framework/java/android/bluetooth/BluetoothMap.java +++ b/framework/java/android/bluetooth/BluetoothMap.java @@ -154,7 +154,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getState(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -184,7 +184,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<BluetoothDevice> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getClient(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -214,7 +214,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isConnected(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -256,7 +256,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -312,7 +312,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -343,7 +343,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -393,7 +393,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { log("getConnectionState(" + pairQuery.second.getAnonymizedAddress() + ") uncached"); } - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); try { pairQuery.first .getConnectionState(pairQuery.second, mAttributionSource, recv); @@ -490,7 +490,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -546,7 +546,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothMapClient.java b/framework/java/android/bluetooth/BluetoothMapClient.java index be3e48a0d9..5241410d41 100644 --- a/framework/java/android/bluetooth/BluetoothMapClient.java +++ b/framework/java/android/bluetooth/BluetoothMapClient.java @@ -267,7 +267,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isConnected(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -297,7 +297,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -329,7 +329,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -360,7 +360,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -397,7 +397,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -432,7 +432,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver<>(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -496,7 +496,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -555,7 +555,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -623,7 +623,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.sendMessage(device, contacts, message, sentIntent, deliveredIntent, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); @@ -655,7 +655,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.getUnreadMessages(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -684,7 +684,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getSupportedFeatures(device, mAttributionSource, recv); return (recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue) & UPLOADING_FEATURE_BITMASK) > 0; @@ -726,7 +726,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable } else if (isEnabled() && isValidDevice(device) && handle != null && (status == READ || status == UNREAD || status == UNDELETED || status == DELETED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setMessageStatus(device, handle, status, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothPan.java b/framework/java/android/bluetooth/BluetoothPan.java index 3aafec9bd0..2f6fe4ef55 100644 --- a/framework/java/android/bluetooth/BluetoothPan.java +++ b/framework/java/android/bluetooth/BluetoothPan.java @@ -222,7 +222,7 @@ public final class BluetoothPan implements BluetoothProfile { "The tethered interface has already been released."); } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mService.setBluetoothTethering(mPanCallback, mId, false, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -309,7 +309,7 @@ public final class BluetoothPan implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -353,7 +353,7 @@ public final class BluetoothPan implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -393,7 +393,7 @@ public final class BluetoothPan implements BluetoothProfile { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -424,7 +424,7 @@ public final class BluetoothPan implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -457,7 +457,7 @@ public final class BluetoothPan implements BluetoothProfile { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -489,7 +489,7 @@ public final class BluetoothPan implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -525,7 +525,7 @@ public final class BluetoothPan implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.setBluetoothTethering(null, 0, value, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -583,7 +583,7 @@ public final class BluetoothPan implements BluetoothProfile { } }; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.setBluetoothTethering(panCallback, callback.hashCode(), true, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -614,7 +614,7 @@ public final class BluetoothPan implements BluetoothProfile { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isTetheringOn(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothPbapClient.java b/framework/java/android/bluetooth/BluetoothPbapClient.java index e10f5e5e49..1a29cea046 100644 --- a/framework/java/android/bluetooth/BluetoothPbapClient.java +++ b/framework/java/android/bluetooth/BluetoothPbapClient.java @@ -172,7 +172,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.connect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -206,7 +206,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); return true; @@ -240,7 +240,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -279,7 +279,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -316,7 +316,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -394,7 +394,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { @@ -455,7 +455,7 @@ public final class BluetoothPbapClient implements BluetoothProfile, AutoCloseabl if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException e) { diff --git a/framework/java/android/bluetooth/BluetoothSap.java b/framework/java/android/bluetooth/BluetoothSap.java index 100f1d8605..137c25b29e 100644 --- a/framework/java/android/bluetooth/BluetoothSap.java +++ b/framework/java/android/bluetooth/BluetoothSap.java @@ -182,7 +182,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getState(mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -211,7 +211,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<BluetoothDevice> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getClient(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -241,7 +241,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.isConnected(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -282,7 +282,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.disconnect(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -310,7 +310,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -340,7 +340,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -390,7 +390,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { log("getConnectionState(" + pairQuery.second.getAnonymizedAddress() + ") uncached"); } - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); try { pairQuery.first .getConnectionState(pairQuery.second, mAttributionSource, recv); @@ -491,7 +491,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -552,7 +552,7 @@ public final class BluetoothSap implements BluetoothProfile, AutoCloseable { if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/BluetoothVolumeControl.java b/framework/java/android/bluetooth/BluetoothVolumeControl.java index 080b9a6d64..d76a08686d 100644 --- a/framework/java/android/bluetooth/BluetoothVolumeControl.java +++ b/framework/java/android/bluetooth/BluetoothVolumeControl.java @@ -157,7 +157,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose final IBluetoothVolumeControl service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.registerCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -245,7 +245,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getConnectedDevices(mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -276,7 +276,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose } else if (isEnabled()) { try { final SynchronousResultReceiver<List<BluetoothDevice>> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv); return Attributable.setAttributionSource( recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue), @@ -306,7 +306,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionState(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -355,7 +355,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose final IBluetoothVolumeControl service = getService(); if (service != null) { final SynchronousResultReceiver<Integer> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.registerCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -406,7 +406,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose try { final IBluetoothVolumeControl service = getService(); if (service != null) { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.unregisterCallback(mCallback, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } @@ -442,7 +442,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled()) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.setVolumeOffset(device, volumeOffset, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { @@ -483,7 +483,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose final boolean defaultValue = false; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.isVolumeOffsetAvailable(device, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -523,7 +523,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) { try { - final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get(); service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { @@ -559,7 +559,7 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose if (DBG) log(Log.getStackTraceString(new Throwable())); } else if (isEnabled() && isValidDevice(device)) { try { - final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get(); service.getConnectionPolicy(device, mAttributionSource, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { diff --git a/framework/java/android/bluetooth/le/AdvertisingSet.java b/framework/java/android/bluetooth/le/AdvertisingSet.java index cad62c3cb2..d65e4858de 100644 --- a/framework/java/android/bluetooth/le/AdvertisingSet.java +++ b/framework/java/android/bluetooth/le/AdvertisingSet.java @@ -81,7 +81,7 @@ public final class AdvertisingSet { public void enableAdvertising(boolean enable, int duration, int maxExtendedAdvertisingEvents) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mGatt.enableAdvertisingSet(mAdvertiserId, enable, duration, maxExtendedAdvertisingEvents, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -107,7 +107,7 @@ public final class AdvertisingSet { @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setAdvertisingData(AdvertiseData advertiseData) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mGatt.setAdvertisingData(mAdvertiserId, advertiseData, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -129,7 +129,7 @@ public final class AdvertisingSet { @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setScanResponseData(AdvertiseData scanResponse) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mGatt.setScanResponseData(mAdvertiserId, scanResponse, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -149,7 +149,7 @@ public final class AdvertisingSet { @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setAdvertisingParameters(AdvertisingSetParameters parameters) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mGatt.setAdvertisingParameters(mAdvertiserId, parameters, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -167,7 +167,7 @@ public final class AdvertisingSet { @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingParameters(PeriodicAdvertisingParameters parameters) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mGatt.setPeriodicAdvertisingParameters(mAdvertiserId, parameters, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -191,7 +191,7 @@ public final class AdvertisingSet { @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingData(AdvertiseData periodicData) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mGatt.setPeriodicAdvertisingData(mAdvertiserId, periodicData, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -211,7 +211,7 @@ public final class AdvertisingSet { @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingEnabled(boolean enable) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mGatt.setPeriodicAdvertisingEnable(mAdvertiserId, enable, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -233,7 +233,7 @@ public final class AdvertisingSet { }) public void getOwnAddress() { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mGatt.getOwnAddress(mAdvertiserId, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { diff --git a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java index c77448f57c..26c856792a 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -463,7 +463,7 @@ public final class BluetoothLeAdvertiser { } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.startAdvertisingSet(parameters, advertiseData, scanResponse, periodicParameters, periodicData, duration, maxExtendedAdvertisingEvents, wrapped, mAttributionSource, recv); @@ -496,7 +496,7 @@ public final class BluetoothLeAdvertiser { IBluetoothGatt gatt; try { gatt = mBluetoothManager.getBluetoothGatt(); - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.stopAdvertisingSet(wrapped, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java index f5f963e21d..28d408ec65 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/framework/java/android/bluetooth/le/BluetoothLeScanner.java @@ -282,7 +282,7 @@ public final class BluetoothLeScanner { wrapper.startRegistration(); } else { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.startScanForIntent(callbackIntent, settings, filters, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); @@ -330,7 +330,7 @@ public final class BluetoothLeScanner { IBluetoothGatt gatt; try { gatt = mBluetoothManager.getBluetoothGatt(); - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.stopScanForIntent(callbackIntent, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -428,7 +428,7 @@ public final class BluetoothLeScanner { // Scan stopped. if (mScannerId == -1 || mScannerId == -2) return; try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mBluetoothGatt.registerScanner(this, mWorkSource, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); wait(REGISTRATION_CALLBACK_TIMEOUT_MILLIS); @@ -460,11 +460,11 @@ public final class BluetoothLeScanner { return; } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mBluetoothGatt.stopScan(mScannerId, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); - final SynchronousResultReceiver recv2 = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv2 = SynchronousResultReceiver.get(); mBluetoothGatt.unregisterScanner(mScannerId, mAttributionSource, recv2); recv2.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -482,7 +482,7 @@ public final class BluetoothLeScanner { return; } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); mBluetoothGatt.flushPendingBatchResults(mScannerId, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -501,7 +501,7 @@ public final class BluetoothLeScanner { synchronized (this) { if (status == BluetoothGatt.GATT_SUCCESS) { try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); if (mScannerId == -1) { // Registration succeeds after timeout, unregister scanner. mBluetoothGatt.unregisterScanner(scannerId, mAttributionSource, recv); diff --git a/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java b/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java index 13b7163f30..7711a00740 100644 --- a/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java +++ b/framework/java/android/bluetooth/le/PeriodicAdvertisingManager.java @@ -177,7 +177,7 @@ public final class PeriodicAdvertisingManager { mCallbackWrappers.put(callback, wrapped); try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.registerSync(scanResult, skip, timeout, wrapped, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -215,7 +215,7 @@ public final class PeriodicAdvertisingManager { } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.unregisterSync(wrapper, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -246,7 +246,7 @@ public final class PeriodicAdvertisingManager { return; } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.transferSync(bda, serviceData , syncHandle, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (TimeoutException | RemoteException e) { @@ -291,7 +291,7 @@ public final class PeriodicAdvertisingManager { throw new IllegalArgumentException("callback was not properly registered"); } try { - final SynchronousResultReceiver recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); gatt.transferSetInfo(bda, serviceData , advHandle, wrapper, mAttributionSource, recv); recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null); } catch (RemoteException | TimeoutException e) { |