From 5467b904812bfe30651334826a0bdbfd1b868c1d Mon Sep 17 00:00:00 2001 From: Etienne Ruffieux Date: Wed, 22 Jun 2022 13:54:25 -0700 Subject: Reuse SynchronousResultReceivers instead of creating new. Bug: 217366135 Tag: #feature Test: manual Ignore-AOSP-First: to be chery-picked Change-Id: If8ae530a284151888a3f89a51d2c58f2a5cd3644 (cherry picked from commit 02dcbe72b3564559eaa9c2e2714824e4aac6f18c) Merged-In: If8ae530a284151888a3f89a51d2c58f2a5cd3644 --- .../java/android/bluetooth/BluetoothDevice.java | 66 +++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'framework/java/android/bluetooth/BluetoothDevice.java') 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getRemoteUuids(this, mAttributionSource, recv); List 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.allowLowLatencyAudio(allowed, this, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { -- cgit v1.2.3 From dd85e91cea26c7f706af36c852e79d5b4ca1f173 Mon Sep 17 00:00:00 2001 From: Neha Jain Date: Wed, 29 Jun 2022 04:04:16 +0000 Subject: Revert "Reuse SynchronousResultReceivers instead of creating new." This reverts commit 02dcbe72b3564559eaa9c2e2714824e4aac6f18c. Reason for revert: Causing builds to fail b/237471430 Change-Id: I6165d838abf312085050359377f67a68a5f8b51a (cherry picked from commit f5dd42bbd05e68f7763ccaa9fae5642acc4ceba1) Merged-In: I6165d838abf312085050359377f67a68a5f8b51a --- .../java/android/bluetooth/BluetoothDevice.java | 66 +++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'framework/java/android/bluetooth/BluetoothDevice.java') diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index 5c91c9480b..6618a55184 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = - SynchronousResultReceiver.get(); + new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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> recv = - SynchronousResultReceiver.get(); + new SynchronousResultReceiver(); service.getRemoteUuids(this, mAttributionSource, recv); List 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); 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 recv = SynchronousResultReceiver.get(); + final SynchronousResultReceiver recv = new SynchronousResultReceiver(); service.allowLowLatencyAudio(allowed, this, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { -- cgit v1.2.3 From 856f6acf59076eb3b200b1581d178745c9f0e681 Mon Sep 17 00:00:00 2001 From: Neha Jain Date: Wed, 29 Jun 2022 23:53:57 +0000 Subject: 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 --- .../java/android/bluetooth/BluetoothDevice.java | 66 +++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'framework/java/android/bluetooth/BluetoothDevice.java') 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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> recv = - new SynchronousResultReceiver(); + SynchronousResultReceiver.get(); service.getRemoteUuids(this, mAttributionSource, recv); List 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver 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 recv = new SynchronousResultReceiver(); + final SynchronousResultReceiver recv = SynchronousResultReceiver.get(); service.allowLowLatencyAudio(allowed, this, recv); return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue); } catch (RemoteException | TimeoutException e) { -- cgit v1.2.3 From 44496dc25a9df80025c489cd9d6c1f6cced7e837 Mon Sep 17 00:00:00 2001 From: Rahul Sabnis Date: Fri, 8 Jul 2022 11:57:32 -0700 Subject: Fixes a bug in the BluetoothDevice#getIdentityAddress API where it returns the mAddress field of the device instead of null when the identity address is not known. Tag: #feature Bug: 238353063 Test: atest AdapterServiceTest#testAddressConsolidate Ignore-AOSP-First: Change needs to land in TM release Change-Id: I577843c9e2cc279915d0632ff25bde66aa949e94 (cherry picked from commit 448c2830336794d350b1c7c4f62c3e406b172e32) Merged-In: I577843c9e2cc279915d0632ff25bde66aa949e94 --- framework/java/android/bluetooth/BluetoothDevice.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'framework/java/android/bluetooth/BluetoothDevice.java') diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index 5c91c9480b..e7a6ea0e84 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -1477,7 +1477,8 @@ public final class BluetoothDevice implements Parcelable, Attributable { * Returns the identity address of this BluetoothDevice. *

For example, "00:11:22:AA:BB:CC". * - * @return Bluetooth identity address as a string + * @return this device's identity address as a string or {@code null} if the identity + * address is either not known or is unable to be retrieved * @hide */ @SystemApi -- cgit v1.2.3 From ef1c055b5d9ce5a3c3917d2935f9c7220755e717 Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Wed, 13 Jul 2022 17:00:30 +0000 Subject: Revert "Fixes a bug in the BluetoothDevice#getIdentityAddress API where it" This reverts commit 448c2830336794d350b1c7c4f62c3e406b172e32. Reason for revert: b/238847789 Test: Clean revert of CL Change-Id: I30941e8b9344e9dbaacaec5ca2c2046d149ed839 (cherry picked from commit bf9246b080ee80380d3fc5f20258294a69f81391) Merged-In: I30941e8b9344e9dbaacaec5ca2c2046d149ed839 --- framework/java/android/bluetooth/BluetoothDevice.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'framework/java/android/bluetooth/BluetoothDevice.java') diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index e7a6ea0e84..5c91c9480b 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -1477,8 +1477,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { * Returns the identity address of this BluetoothDevice. *

For example, "00:11:22:AA:BB:CC". * - * @return this device's identity address as a string or {@code null} if the identity - * address is either not known or is unable to be retrieved + * @return Bluetooth identity address as a string * @hide */ @SystemApi -- cgit v1.2.3