Merge "Binder cache for Bluetooth getState()." (cedec5d3) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/btservice/AdapterService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -644,8 +644,13 @@ public class AdapterService extends Service {
		setProfileServiceState(GattService.class, BluetoothAdapter.STATE_OFF);
		}

		private void invalidateBluetoothGetStateCache() {
		BluetoothAdapter.invalidateBluetoothGetStateCache();
		}

		void updateAdapterState(int prevState, int newState) {
		mAdapterProperties.setState(newState);
		invalidateBluetoothGetStateCache();
		if (mCallbacks != null) {
		int n = mCallbacks.beginBroadcast();
		debugLog("updateAdapterState() - Broadcasting state " + BluetoothAdapter.nameForState(
		@@ -1050,6 +1055,8 @@ public class AdapterService extends Service {

		AdapterServiceBinder(AdapterService svc) {
		mService = svc;
		mService.invalidateBluetoothGetStateCache();
		BluetoothAdapter.getDefaultAdapter().disableBluetoothGetStateCache();
		}

		public void cleanup() {
		@@ -2131,8 +2138,6 @@ public class AdapterService extends Service {
		}
		}

		;

		// ----API Methods--------

		public int getState() {