Merge "Independent methods to enable/disable BLE mode" into rvc-dev am:... (dc4bb2b1) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+7 −30

Original line number	Original line	Diff line number	Diff line
	@@ -917,24 +917,12 @@ public final class BluetoothAdapter {
	if (!isBleScanAlwaysAvailable()) {		if (!isBleScanAlwaysAvailable()) {
	return false;		return false;
	}		}

	int state = getLeState();
	if (state == BluetoothAdapter.STATE_ON \|\| state == BluetoothAdapter.STATE_BLE_ON) {
	String packageName = ActivityThread.currentPackageName();		String packageName = ActivityThread.currentPackageName();
	if (DBG) {
	Log.d(TAG, "disableBLE(): de-registering " + packageName);
	}
	try {		try {
	mManagerService.updateBleAppCount(mToken, false, packageName);		return mManagerService.disableBle(packageName, mToken);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "", e);		Log.e(TAG, "", e);
	}		}
	return true;
	}

	if (DBG) {
	Log.d(TAG, "disableBLE(): Already disabled");
	}
	return false;		return false;
	}		}

	@@ -974,20 +962,9 @@ public final class BluetoothAdapter {
	if (!isBleScanAlwaysAvailable()) {		if (!isBleScanAlwaysAvailable()) {
	return false;		return false;
	}		}

	try {
	String packageName = ActivityThread.currentPackageName();		String packageName = ActivityThread.currentPackageName();
	mManagerService.updateBleAppCount(mToken, true, packageName);		try {
	if (isLeEnabled()) {		return mManagerService.enableBle(packageName, mToken);
	if (DBG) {
	Log.d(TAG, "enableBLE(): Bluetooth already enabled");
	}
	return true;
	}
	if (DBG) {
	Log.d(TAG, "enableBLE(): Calling enable");
	}
	return mManagerService.enable(packageName);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "", e);		Log.e(TAG, "", e);
	}		}

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

+107 −61

Original line number	Original line	Diff line number	Diff line
	@@ -828,13 +828,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	}		}
	}		}

	public int updateBleAppCount(IBinder token, boolean enable, String packageName) {		private int updateBleAppCount(IBinder token, boolean enable, String packageName) {
	// Check if packageName belongs to callingUid
	final int callingUid = Binder.getCallingUid();
	final boolean isCallerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;
	if (!isCallerSystem) {
	checkPackage(callingUid, packageName);
	}
	ClientDeathRecipient r = mBleApps.get(token);		ClientDeathRecipient r = mBleApps.get(token);
	if (r == null && enable) {		if (r == null && enable) {
	ClientDeathRecipient deathRec = new ClientDeathRecipient(packageName);		ClientDeathRecipient deathRec = new ClientDeathRecipient(packageName);
	@@ -859,13 +853,94 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	if (DBG) {		if (DBG) {
	Slog.d(TAG, appCount + " registered Ble Apps");		Slog.d(TAG, appCount + " registered Ble Apps");
	}		}
	if (appCount == 0 && mEnable) {		return appCount;
			}

			private boolean checkBluetoothPermissions(String packageName, boolean requireForeground) {
			if (isBluetoothDisallowed()) {
			if (DBG) {
			Slog.d(TAG, "checkBluetoothPermissions: bluetooth disallowed");
			}
			return false;
			}
			// Check if packageName belongs to callingUid
			final int callingUid = Binder.getCallingUid();
			final boolean isCallerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;
			if (!isCallerSystem) {
			checkPackage(callingUid, packageName);

			if (requireForeground && !checkIfCallerIsForegroundUser()) {
			Slog.w(TAG, "Not allowed for non-active and non system user");
			return false;
			}

			mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
			"Need BLUETOOTH ADMIN permission");
			}
			return true;
			}

			public boolean enableBle(String packageName, IBinder token) throws RemoteException {
			if (!checkBluetoothPermissions(packageName, false)) {
			if (DBG) {
			Slog.d(TAG, "enableBle(): bluetooth disallowed");
			}
			return false;
			}

			if (DBG) {
			Slog.d(TAG, "enableBle(" + packageName + "): mBluetooth =" + mBluetooth
			+ " mBinding = " + mBinding + " mState = "
			+ BluetoothAdapter.nameForState(mState));
			}
			updateBleAppCount(token, true, packageName);

			if (mState == BluetoothAdapter.STATE_ON
			\|\| mState == BluetoothAdapter.STATE_BLE_ON
			\|\| mState == BluetoothAdapter.STATE_TURNING_ON
			\|\| mState == BluetoothAdapter.STATE_TURNING_OFF) {
			Log.d(TAG, "enableBLE(): Bluetooth already enabled");
			return true;
			}
			synchronized (mReceiver) {
			// waive WRITE_SECURE_SETTINGS permission check
			sendEnableMsg(false,
			BluetoothProtoEnums.ENABLE_DISABLE_REASON_APPLICATION_REQUEST, packageName);
			}
			return true;
			}

			public boolean disableBle(String packageName, IBinder token) throws RemoteException {
			if (!checkBluetoothPermissions(packageName, false)) {
			if (DBG) {
			Slog.d(TAG, "disableBLE(): bluetooth disallowed");
			}
			return false;
			}

			if (DBG) {
			Slog.d(TAG, "disableBle(" + packageName + "): mBluetooth =" + mBluetooth
			+ " mBinding = " + mBinding + " mState = "
			+ BluetoothAdapter.nameForState(mState));
			}

			if (mState == BluetoothAdapter.STATE_OFF) {
			Slog.d(TAG, "disableBLE(): Already disabled");
			return false;
			}
			updateBleAppCount(token, false, packageName);

			if (mState == BluetoothAdapter.STATE_BLE_ON && !isBleAppPresent()) {
			if (mEnable) {
	disableBleScanMode();		disableBleScanMode();
	}		}
	if (appCount == 0 && !mEnableExternal) {		if (!mEnableExternal) {
			addActiveLog(BluetoothProtoEnums.ENABLE_DISABLE_REASON_APPLICATION_REQUEST,
			packageName, false);
	sendBrEdrDownCallback();		sendBrEdrDownCallback();
	}		}
	return appCount;		}
			return true;
	}		}

	// Clear all apps using BLE scan only mode.		// Clear all apps using BLE scan only mode.
	@@ -943,29 +1018,19 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	}		}

	public boolean enableNoAutoConnect(String packageName) {		public boolean enableNoAutoConnect(String packageName) {
	if (isBluetoothDisallowed()) {		if (!checkBluetoothPermissions(packageName, false)) {
	if (DBG) {		if (DBG) {
	Slog.d(TAG, "enableNoAutoConnect(): not enabling - bluetooth disallowed");		Slog.d(TAG, "enableNoAutoConnect(): not enabling - bluetooth disallowed");
	}		}
	return false;		return false;
	}		}

	// Check if packageName belongs to callingUid
	final int callingUid = Binder.getCallingUid();
	final boolean isCallerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;
	if (!isCallerSystem) {
	checkPackage(callingUid, packageName);
	}

	mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
	"Need BLUETOOTH ADMIN permission");

	if (DBG) {		if (DBG) {
	Slog.d(TAG, "enableNoAutoConnect(): mBluetooth =" + mBluetooth + " mBinding = "		Slog.d(TAG, "enableNoAutoConnect(): mBluetooth =" + mBluetooth + " mBinding = "
	+ mBinding);		+ mBinding);
	}		}
	int callingAppId = UserHandle.getAppId(callingUid);

			int callingAppId = UserHandle.getAppId(Binder.getCallingUid());
	if (callingAppId != Process.NFC_UID) {		if (callingAppId != Process.NFC_UID) {
	throw new SecurityException("no permission to enable Bluetooth quietly");		throw new SecurityException("no permission to enable Bluetooth quietly");
	}		}
	@@ -980,33 +1045,20 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	}		}

	public boolean enable(String packageName) throws RemoteException {		public boolean enable(String packageName) throws RemoteException {
	final int callingUid = Binder.getCallingUid();		if (!checkBluetoothPermissions(packageName, true)) {
	final boolean callerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;

	if (isBluetoothDisallowed()) {
	if (DBG) {		if (DBG) {
	Slog.d(TAG, "enable(): not enabling - bluetooth disallowed");		Slog.d(TAG, "enable(): not enabling - bluetooth disallowed");
	}		}
	return false;		return false;
	}		}

	if (!callerSystem) {		final int callingUid = Binder.getCallingUid();
	// Check if packageName belongs to callingUid		final boolean callerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;
	checkPackage(callingUid, packageName);		if (!callerSystem && !isEnabled() && mWirelessConsentRequired
			&& startConsentUiIfNeeded(packageName,
	if (!checkIfCallerIsForegroundUser()) {
	Slog.w(TAG, "enable(): not allowed for non-active and non system user");
	return false;
	}

	mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
	"Need BLUETOOTH ADMIN permission");

	if (!isEnabled() && mWirelessConsentRequired && startConsentUiIfNeeded(packageName,
	callingUid, BluetoothAdapter.ACTION_REQUEST_ENABLE)) {		callingUid, BluetoothAdapter.ACTION_REQUEST_ENABLE)) {
	return false;		return false;
	}		}
	}

	if (DBG) {		if (DBG) {
	Slog.d(TAG, "enable(" + packageName + "): mBluetooth =" + mBluetooth + " mBinding = "		Slog.d(TAG, "enable(" + packageName + "): mBluetooth =" + mBluetooth + " mBinding = "
	@@ -1027,26 +1079,20 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	}		}

	public boolean disable(String packageName, boolean persist) throws RemoteException {		public boolean disable(String packageName, boolean persist) throws RemoteException {
	final int callingUid = Binder.getCallingUid();		if (!checkBluetoothPermissions(packageName, true)) {
	final boolean callerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;		if (DBG) {
			Slog.d(TAG, "disable(): not disabling - bluetooth disallowed");
	if (!callerSystem) {		}
	// Check if packageName belongs to callingUid
	checkPackage(callingUid, packageName);

	if (!checkIfCallerIsForegroundUser()) {
	Slog.w(TAG, "disable(): not allowed for non-active and non system user");
	return false;		return false;
	}		}

	mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,		final int callingUid = Binder.getCallingUid();
	"Need BLUETOOTH ADMIN permission");		final boolean callerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;
			if (!callerSystem && isEnabled() && mWirelessConsentRequired
	if (isEnabled() && mWirelessConsentRequired && startConsentUiIfNeeded(packageName,		&& startConsentUiIfNeeded(packageName,
	callingUid, BluetoothAdapter.ACTION_REQUEST_DISABLE)) {		callingUid, BluetoothAdapter.ACTION_REQUEST_DISABLE)) {
	return false;		return false;
	}		}
	}

	if (DBG) {		if (DBG) {
	Slog.d(TAG, "disable(): mBluetooth = " + mBluetooth + " mBinding = " + mBinding);		Slog.d(TAG, "disable(): mBluetooth = " + mBluetooth + " mBinding = " + mBinding);