Snap for 8183382 from 521445786ac2c895f4dc24a202c111469a9713ce to tm-release

Change-Id: Ia9fb27cdc173c743c8d818571d8bd3548a9b1f9f

1 files changed, 57 insertions, 45 deletions

diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java
index 95e9abc37b..1d1b2334bd 100644
--- a/framework/java/android/bluetooth/BluetoothDevice.java
+++ b/framework/java/android/bluetooth/BluetoothDevice.java
@@ -25,7 +25,8 @@ import android.annotation.RequiresPermission;
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.annotation.SuppressLint;
-import android.annotation.SystemApi; //import android.app.PropertyInvalidatedCache;
+import android.annotation.SystemApi;
+import android.app.PropertyInvalidatedCache;
 import android.bluetooth.annotations.RequiresBluetoothConnectPermission;
 import android.bluetooth.annotations.RequiresBluetoothLocationPermission;
 import android.bluetooth.annotations.RequiresBluetoothScanPermission;
@@ -1810,42 +1811,71 @@ public final class BluetoothDevice implements Parcelable, Attributable {
         return defaultValue;
     }
 
-    /*
-    private static final String BLUETOOTH_BONDING_CACHE_PROPERTY =
-            "cache_key.bluetooth.get_bond_state";
-    private final PropertyInvalidatedCache<BluetoothDevice, Integer> mBluetoothBondCache =
-            new PropertyInvalidatedCache<BluetoothDevice, Integer>(
-                8, BLUETOOTH_BONDING_CACHE_PROPERTY) {
+    /**
+     * There are several instances of PropertyInvalidatedCache used in this class.
+     * BluetoothCache wraps up the common code.  All caches are created with a maximum of
+     * eight entries, and the key is in the bluetooth module.  The name is set to the api.
+     */
+    private static class BluetoothCache<Q, R> extends PropertyInvalidatedCache<Q, R> {
+        BluetoothCache(String api, PropertyInvalidatedCache.QueryHandler query) {
+            super(8, PropertyInvalidatedCache.MODULE_BLUETOOTH, api, api, query);
+        }};
+
+    /**
+     * Invalidate a bluetooth cache.  This method is just a short-hand wrapper that
+     * enforces the bluetooth module.
+     */
+    private static void invalidateCache(@NonNull String api) {
+        PropertyInvalidatedCache.invalidateCache(PropertyInvalidatedCache.MODULE_BLUETOOTH, api);
+    }
+
+    private final
+            PropertyInvalidatedCache.QueryHandler<BluetoothDevice, Integer> mBluetoothBondQuery =
+            new PropertyInvalidatedCache.QueryHandler<>() {
+                @RequiresLegacyBluetoothPermission
+                @RequiresBluetoothConnectPermission
+                @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
                 @Override
-                @SuppressLint("AndroidFrameworkRequiresPermission")
-                public Integer recompute(BluetoothDevice query) {
-                    final int defaultValue = BluetoothDevice.BOND_NONE;
-                    try {
-                        final SynchronousResultReceiver<Integer> recv =
-                                new SynchronousResultReceiver();
-                        sService.getBondState(query, mAttributionSource, recv);
-                        return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);
-                    } catch (TimeoutException e) {
-                        Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
-                    } catch (RemoteException e) {
-                        throw e.rethrowAsRuntimeException();
+                public Integer apply(BluetoothDevice query) {
+                    if (DBG) log("getBondState() uncached");
+                    final IBluetooth service = sService;
+                    final int defaultValue = BOND_NONE;
+                    if (service == null) {
+                        Log.e(TAG, "BT not enabled. Cannot get bond state");
+                        if (DBG) log(Log.getStackTraceString(new Throwable()));
+                    } else {
+                        try {
+                            final SynchronousResultReceiver<Integer> recv =
+                                    new SynchronousResultReceiver();
+                            service.getBondState(BluetoothDevice.this, mAttributionSource, recv);
+                            return recv.awaitResultNoInterrupt(getSyncTimeout())
+                                            .getValue(defaultValue);
+                        } catch (TimeoutException e) {
+                            Log.e(TAG, e.toString() + "\n"
+                                    + Log.getStackTraceString(new Throwable()));
+                        } catch (RemoteException e) {
+                            Log.e(TAG, "failed to ", e);
+                            e.rethrowFromSystemServer();
+                        }
                     }
                     return defaultValue;
                 }
             };
-     */
+
+    private static final String GET_BOND_STATE_API = "getBondState";
+
+    private final BluetoothCache<BluetoothDevice, Integer> mBluetoothBondCache =
+        new BluetoothCache<BluetoothDevice, Integer>(GET_BOND_STATE_API, mBluetoothBondQuery);
 
     /** @hide */
-    /* public void disableBluetoothGetBondStateCache() {
-        mBluetoothBondCache.disableLocal();
-    } */
+    public void disableBluetoothGetBondStateCache() {
+        mBluetoothBondCache.disableForCurrentProcess();
+    }
 
     /** @hide */
-    /*
     public static void invalidateBluetoothGetBondStateCache() {
-        PropertyInvalidatedCache.invalidateCache(BLUETOOTH_BONDING_CACHE_PROPERTY);
+        invalidateCache(GET_BOND_STATE_API);
     }
-     */
 
     /**
      * Get the bond state of the remote device.
@@ -1862,25 +1892,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {
     @SuppressLint("AndroidFrameworkRequiresPermission")
     public int getBondState() {
         if (DBG) log("getBondState()");
-        final IBluetooth service = sService;
-        final int defaultValue = BOND_NONE;
-        if (service == null) {
-            Log.e(TAG, "BT not enabled. Cannot get bond state");
-            if (DBG) log(Log.getStackTraceString(new Throwable()));
-        } else {
-            try {
-                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();
-                //return mBluetoothBondCache.query(this);
-                service.getBondState(this, mAttributionSource, recv);
-                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);
-            } catch (TimeoutException e) {
-                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
-            } catch (RemoteException e) {
-                Log.e(TAG, "failed to ", e);
-                e.rethrowFromSystemServer();
-            }
-        }
-        return defaultValue;
+        return mBluetoothBondCache.query(null);
     }
 
     /**