Merge "SystemServer: Remove RequiresPermission from code" into main (67dadff7) · Commits · e / os / android_packages_modules_Bluetooth

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

+0 −29

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import static com.android.modules.utils.build.SdkLevel.isAtLeastV;
		import static java.util.Objects.requireNonNull;

		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.app.ActivityManager;
		import android.app.BroadcastOptions;
		import android.bluetooth.BluetoothAdapter;
		@@ -420,7 +419,6 @@ class BluetoothManagerService {
		private static final Object ON_SATELLITE_MODE_CHANGED_TOKEN = new Object();
		private static final Object ON_SWITCH_USER_TOKEN = new Object();

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		Unit onAirplaneModeChanged(boolean isAirplaneModeOn) {
		mHandler.postDelayed(
		() ->
		@@ -434,7 +432,6 @@ class BluetoothManagerService {
		}

		// TODO(b/289584302): Update to private once use_new_satellite_mode is enabled
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		Unit onSatelliteModeChanged(boolean isSatelliteModeOn) {
		mHandler.postDelayed(
		() ->
		@@ -447,7 +444,6 @@ class BluetoothManagerService {
		return Unit.INSTANCE;
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		void onSwitchUser(UserHandle userHandle) {
		mHandler.postDelayed(
		() ->
		@@ -489,7 +485,6 @@ class BluetoothManagerService {
		}
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		private void handleAirplaneModeChanged(boolean isAirplaneModeOn) {
		synchronized (this) {
		if (isBluetoothPersistedStateOn()) {
		@@ -1063,7 +1058,6 @@ class BluetoothManagerService {
		* Will call startBrEdr() if bluetooth classic should be on and will call stopBle if bluetooth
		* BLE should be off
		*/
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		private void continueFromBleOnState() {
		mAdapterLock.readLock().lock();
		try {
		@@ -1098,11 +1092,6 @@ class BluetoothManagerService {
		* Inform BluetoothAdapter instances that BREDR part is down and turn off all service and stack
		* if no LE app needs it
		*/
		@RequiresPermission(
		allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		})
		private void sendBrEdrDownCallback() {
		mAdapterLock.readLock().lock();
		try {
		@@ -1206,7 +1195,6 @@ class BluetoothManagerService {
		return true;
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		void unbindAndFinish() {
		Log.d(TAG, "unbindAndFinish(): mAdapter=" + mAdapter + " isBinding=" + isBinding());

		@@ -1796,11 +1784,6 @@ class BluetoothManagerService {
		}
		}

		@RequiresPermission(
		allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED
		})
		private void restartForNewUser(UserHandle unusedNewUser) {
		mAdapterLock.readLock().lock();
		try {
		@@ -1952,7 +1935,6 @@ class BluetoothManagerService {
		}
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		private void handleEnable(boolean quietMode) {
		mQuietEnable = quietMode;

		@@ -1993,7 +1975,6 @@ class BluetoothManagerService {
		return true;
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		private void handleDisable() {
		mAdapterLock.readLock().lock();
		try {
		@@ -2034,11 +2015,6 @@ class BluetoothManagerService {
		return false;
		}

		@RequiresPermission(
		allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		})
		private void bluetoothStateChangeHandler(int prevState, int newState) {
		if (prevState == newState) { // No change. Nothing to do.
		return;
		@@ -2164,11 +2140,6 @@ class BluetoothManagerService {
		}
		}

		@RequiresPermission(
		allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		})
		private void recoverBluetoothServiceFromError(boolean clearBle) {
		Log.e(TAG, "recoverBluetoothServiceFromError");
		boolean repeatAirplaneRunnable = false;