Merge cherrypicks of [19114242] into tm-release.

Change-Id: I67377ee00eae39bd4676731556b42f1c4ffecf20

1 files changed, 11 insertions, 11 deletions

diff --git a/framework/java/android/bluetooth/BluetoothGattServer.java b/framework/java/android/bluetooth/BluetoothGattServer.java
index d652bd8476..8b84505e36 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 = SynchronousResultReceiver.get();
+                final SynchronousResultReceiver recv = new SynchronousResultReceiver();
                 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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             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 = SynchronousResultReceiver.get();
+            final SynchronousResultReceiver recv = new SynchronousResultReceiver();
             mService.clearServices(mServerIf, mAttributionSource, recv);
             recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);
             mServices.clear();