Snap for 6570253 from 3f10ea63095eb1dfa6775cea091466f564d75396 to sc-release (0905bc68) · 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();
		}

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+121 −74

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.UserManagerInternal;
		import android.os.UserManagerInternal.UserRestrictionsListener;
		import android.provider.DeviceConfig;
		import android.provider.Settings;
		import android.provider.Settings.SettingNotFoundException;
		import android.text.TextUtils;
		@@ -114,6 +115,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		private static final int ADD_PROXY_DELAY_MS = 100;
		// Delay for retrying enable and disable in msec
		private static final int ENABLE_DISABLE_DELAY_MS = 300;
		private static final int DELAY_BEFORE_RESTART_DUE_TO_INIT_FLAGS_CHANGED_MS = 300;

		private static final int MESSAGE_ENABLE = 1;
		private static final int MESSAGE_DISABLE = 2;
		@@ -133,6 +135,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		private static final int MESSAGE_ADD_PROXY_DELAYED = 400;
		private static final int MESSAGE_BIND_PROFILE_SERVICE = 401;
		private static final int MESSAGE_RESTORE_USER_SETTING = 500;
		private static final int MESSAGE_INIT_FLAGS_CHANGED = 600;

		private static final int RESTORE_SETTING_TO_ON = 1;
		private static final int RESTORE_SETTING_TO_OFF = 0;
		@@ -278,6 +281,30 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		}
		};

		private final DeviceConfig.OnPropertiesChangedListener mDeviceConfigChangedListener =
		new DeviceConfig.OnPropertiesChangedListener() {
		@Override
		public void onPropertiesChanged(DeviceConfig.Properties properties) {
		if (!properties.getNamespace().equals(DeviceConfig.NAMESPACE_BLUETOOTH)) {
		return;
		}
		boolean foundInit = false;
		for (String name : properties.getKeyset()) {
		if (name.startsWith("INIT_")) {
		foundInit = true;
		break;
		}
		}
		if (!foundInit) {
		return;
		}
		mHandler.removeMessages(MESSAGE_INIT_FLAGS_CHANGED);
		mHandler.sendEmptyMessageDelayed(
		MESSAGE_INIT_FLAGS_CHANGED,
		DELAY_BEFORE_RESTART_DUE_TO_INIT_FLAGS_CHANGED_MS);
		}
		};

		public boolean onFactoryReset() {
		// Wait for stable state if bluetooth is temporary state.
		int state = getState();
		@@ -507,6 +534,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		Slog.w(TAG, "Unable to resolve SystemUI's UID.");
		}
		mSystemUiUid = systemUiUid;
		DeviceConfig.addOnPropertiesChangedListener(
		DeviceConfig.NAMESPACE_BLUETOOTH,
		(Runnable r) -> r.run(),
		mDeviceConfigChangedListener);
		}

		/**
		@@ -2148,6 +2179,50 @@ class BluetoothManagerService extends IBluetoothManager.Stub {

		/* disable and enable BT when detect a user switch */
		if (mBluetooth != null && isEnabled()) {
		restartForReason(BluetoothProtoEnums.ENABLE_DISABLE_REASON_USER_SWITCH);
		} else if (mBinding \|\| mBluetooth != null) {
		Message userMsg = mHandler.obtainMessage(MESSAGE_USER_SWITCHED);
		userMsg.arg2 = 1 + msg.arg2;
		// if user is switched when service is binding retry after a delay
		mHandler.sendMessageDelayed(userMsg, USER_SWITCHED_TIME_MS);
		if (DBG) {
		Slog.d(TAG, "Retry MESSAGE_USER_SWITCHED " + userMsg.arg2);
		}
		}
		break;
		}
		case MESSAGE_USER_UNLOCKED: {
		if (DBG) {
		Slog.d(TAG, "MESSAGE_USER_UNLOCKED");
		}
		mHandler.removeMessages(MESSAGE_USER_SWITCHED);

		if (mEnable && !mBinding && (mBluetooth == null)) {
		// We should be connected, but we gave up for some
		// reason; maybe the Bluetooth service wasn't encryption
		// aware, so try binding again.
		if (DBG) {
		Slog.d(TAG, "Enabled but not bound; retrying after unlock");
		}
		handleEnable(mQuietEnable);
		}
		break;
		}
		case MESSAGE_INIT_FLAGS_CHANGED: {
		if (DBG) {
		Slog.d(TAG, "MESSAGE_INIT_FLAGS_CHANGED");
		}
		mHandler.removeMessages(MESSAGE_INIT_FLAGS_CHANGED);
		if (mBluetooth != null && isEnabled()) {
		restartForReason(
		BluetoothProtoEnums.ENABLE_DISABLE_REASON_INIT_FLAGS_CHANGED);
		}
		break;
		}
		}
		}

		private void restartForReason(int reason) {
		try {
		mBluetoothLock.readLock().lock();
		if (mBluetooth != null) {
		@@ -2177,8 +2252,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {

		unbindAllBluetoothProfileServices();
		// disable
		addActiveLog(BluetoothProtoEnums.ENABLE_DISABLE_REASON_USER_SWITCH,
		mContext.getPackageName(), false);
		addActiveLog(reason, mContext.getPackageName(), false);
		handleDisable();
		// Pbap service need receive STATE_TURNING_OFF intent to close
		bluetoothStateChangeHandler(BluetoothAdapter.STATE_ON,
		@@ -2217,39 +2291,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);
		mState = BluetoothAdapter.STATE_OFF;
		// enable
		addActiveLog(BluetoothProtoEnums.ENABLE_DISABLE_REASON_USER_SWITCH,
		mContext.getPackageName(), true);
		addActiveLog(reason, mContext.getPackageName(), true);
		// mEnable flag could have been reset on disableBLE. Reenable it.
		mEnable = true;
		handleEnable(mQuietEnable);
		} else if (mBinding \|\| mBluetooth != null) {
		Message userMsg = mHandler.obtainMessage(MESSAGE_USER_SWITCHED);
		userMsg.arg2 = 1 + msg.arg2;
		// if user is switched when service is binding retry after a delay
		mHandler.sendMessageDelayed(userMsg, USER_SWITCHED_TIME_MS);
		if (DBG) {
		Slog.d(TAG, "Retry MESSAGE_USER_SWITCHED " + userMsg.arg2);
		}
		}
		break;
		}
		case MESSAGE_USER_UNLOCKED: {
		if (DBG) {
		Slog.d(TAG, "MESSAGE_USER_UNLOCKED");
		}
		mHandler.removeMessages(MESSAGE_USER_SWITCHED);

		if (mEnable && !mBinding && (mBluetooth == null)) {
		// We should be connected, but we gave up for some
		// reason; maybe the Bluetooth service wasn't encryption
		// aware, so try binding again.
		if (DBG) {
		Slog.d(TAG, "Enabled but not bound; retrying after unlock");
		}
		handleEnable(mQuietEnable);
		}
		}
		}
		}
		}

		@@ -2711,6 +2756,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		return "RESTORE_USER_SETTING";
		case BluetoothProtoEnums.ENABLE_DISABLE_REASON_FACTORY_RESET:
		return "FACTORY_RESET";
		case BluetoothProtoEnums.ENABLE_DISABLE_REASON_INIT_FLAGS_CHANGED:
		return "INIT_FLAGS_CHANGED";
		case BluetoothProtoEnums.ENABLE_DISABLE_REASON_UNSPECIFIED:
		default: return "UNKNOWN[" + reason + "]";
		}