Merge "Create a binder cache for IBluetooth.getConnectionState" (1298ebc8) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+37 −3

Original line number	Diff line number	Diff line
		@@ -2348,6 +2348,36 @@ public final class BluetoothAdapter {
		return supportedProfiles;
		}

		private static final String BLUETOOTH_GET_ADAPTER_CONNECTION_STATE_CACHE_PROPERTY =
		"cache_key.bluetooth.get_adapter_connection_state";
		private final PropertyInvalidatedCache<Void, Integer>
		mBluetoothGetAdapterConnectionStateCache =
		new PropertyInvalidatedCache<Void, Integer> (
		8, BLUETOOTH_GET_ADAPTER_CONNECTION_STATE_CACHE_PROPERTY) {
		/**
		* This method must not be called when mService is null.
		*/
		@Override
		protected Integer recompute(Void query) {
		try {
		return mService.getAdapterConnectionState();
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		}
		}
		};

		/** @hide */
		public void disableGetAdapterConnectionStateCache() {
		mBluetoothGetAdapterConnectionStateCache.disableLocal();
		}

		/** @hide */
		public static void invalidateGetAdapterConnectionStateCache() {
		PropertyInvalidatedCache.invalidateCache(
		BLUETOOTH_GET_ADAPTER_CONNECTION_STATE_CACHE_PROPERTY);
		}

		/**
		* Get the current connection state of the local Bluetooth adapter.
		* This can be used to check whether the local Bluetooth adapter is connected
		@@ -2368,10 +2398,14 @@ public final class BluetoothAdapter {
		try {
		mServiceLock.readLock().lock();
		if (mService != null) {
		return mService.getAdapterConnectionState();
		return mBluetoothGetAdapterConnectionStateCache.query(null);
		}
		} catch (RuntimeException e) {
		if (e.getCause() instanceof RemoteException) {
		Log.e(TAG, "getConnectionState:", e.getCause());
		} else {
		throw e;
		}
		} catch (RemoteException e) {
		Log.e(TAG, "getConnectionState:", e);
		} finally {
		mServiceLock.readLock().unlock();
		}