Merge "Remove unused {get,set}IoCapability hidden api" into main (bf3d929c) · Commits · e / os / android_packages_modules_Bluetooth

android/app/aidl/android/bluetooth/IBluetooth.aidl

+0 −4

Original line number	Diff line number	Diff line
		@@ -69,10 +69,6 @@ interface IBluetooth
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")
		int getNameLengthForAdvertise(in AttributionSource attributionSource);

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getIoCapability(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		boolean setIoCapability(int capability, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")
		int getScanMode(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

android/app/src/com/android/bluetooth/btservice/AbstractionLayer.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,6 @@ public final class AbstractionLayer {
		public static final int BT_DEVICE_TYPE_BLE = 0x02;
		public static final int BT_DEVICE_TYPE_DUAL = 0x03;

		static final int BT_PROPERTY_LOCAL_IO_CAPS = 0x0e;

		static final int BT_BOND_STATE_NONE = 0x00;
		static final int BT_BOND_STATE_BONDING = 0x01;
		static final int BT_BOND_STATE_BONDED = 0x02;

android/app/src/com/android/bluetooth/btservice/AdapterProperties.java

+0 −28

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ class AdapterProperties {
		private volatile int mScanMode;
		private volatile int mDiscoverableTimeout;
		private volatile ParcelUuid[] mUuids;
		private volatile int mLocalIOCapability = BluetoothAdapter.IO_CAPABILITY_UNKNOWN;

		private CopyOnWriteArrayList<BluetoothDevice> mBondedDevices =
		new CopyOnWriteArrayList<BluetoothDevice>();
		@@ -341,28 +340,6 @@ class AdapterProperties {
		}
		}

		boolean setIoCapability(int capability) {
		synchronized (mObject) {
		boolean result =
		mService.getNative()
		.setAdapterProperty(
		AbstractionLayer.BT_PROPERTY_LOCAL_IO_CAPS,
		Utils.intToByteArray(capability));

		if (result) {
		mLocalIOCapability = capability;
		}

		return result;
		}
		}

		int getIoCapability() {
		synchronized (mObject) {
		return mLocalIOCapability;
		}
		}

		/**
		* @return the mScanMode
		*/
		@@ -1066,11 +1043,6 @@ class AdapterProperties {
		updateDynamicAudioBufferSupport(val);
		break;

		case AbstractionLayer.BT_PROPERTY_LOCAL_IO_CAPS:
		mLocalIOCapability = Utils.byteArrayToInt(val);
		debugLog("mLocalIOCapability set to " + mLocalIOCapability);
		break;

		default:
		errorLog("Property change not handled in Java land:" + type);
		}

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

+0 −43

Original line number	Diff line number	Diff line
		@@ -539,8 +539,6 @@ public class AdapterService extends Service {
		mAdapterProperties.onBluetoothReady();
		updateUuids();
		initProfileServices();
		mNativeInterface.getAdapterProperty(
		AbstractionLayer.BT_PROPERTY_LOCAL_IO_CAPS);
		mNativeInterface.getAdapterProperty(
		AbstractionLayer.BT_PROPERTY_DYNAMIC_AUDIO_BUFFER);
		mAdapterStateMachine.sendMessage(AdapterState.BREDR_STARTED);
		@@ -2452,37 +2450,6 @@ public class AdapterService extends Service {
		return service.mAdapterProperties.setName(name);
		}

		@Override
		public int getIoCapability(AttributionSource attributionSource) {
		AdapterService service = getService();
		if (service == null
		\|\| !callerIsSystemOrActiveOrManagedUser(service, TAG, "getIoCapability")
		\|\| !Utils.checkConnectPermissionForDataDelivery(
		service, attributionSource, "AdapterService getIoCapability")) {
		return BluetoothAdapter.IO_CAPABILITY_UNKNOWN;
		}

		return service.mAdapterProperties.getIoCapability();
		}

		@Override
		public boolean setIoCapability(int capability, AttributionSource source) {
		AdapterService service = getService();
		if (service == null
		\|\| !callerIsSystemOrActiveOrManagedUser(service, TAG, "setIoCapability")
		\|\| !Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {
		return false;
		}

		enforceBluetoothPrivilegedPermission(service);

		if (!isValidIoCapability(capability)) {
		return false;
		}

		return service.mAdapterProperties.setIoCapability(capability);
		}

		@Override
		public int getScanMode(AttributionSource attributionSource) {
		AdapterService service = getService();
		@@ -4702,16 +4669,6 @@ public class AdapterService extends Service {
		return mAdapterProperties.getName().length();
		}

		@VisibleForTesting
		static boolean isValidIoCapability(int capability) {
		if (capability < 0 \|\| capability >= BluetoothAdapter.IO_CAPABILITY_MAX) {
		Log.e(TAG, "Invalid IO capability value - " + capability);
		return false;
		}

		return true;
		}

		List<DiscoveringPackage> getDiscoveringPackages() {
		return mDiscoveringPackages;
		}

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceBinderTest.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -94,12 +94,6 @@ public class AdapterServiceBinderTest {
		verify(mService, never()).generateLocalOobData(transport, cb);
		}

		@Test
		public void getIoCapability() {
		mBinder.getIoCapability(mAttributionSource);
		verify(mService.mAdapterProperties).getIoCapability();
		}

		@Test
		public void getLeMaximumAdvertisingDataLength() {
		mBinder.getLeMaximumAdvertisingDataLength();
		@@ -156,13 +150,6 @@ public class AdapterServiceBinderTest {
		verify(mService).retrievePendingSocketForServiceRecord(uuid, mAttributionSource);
		}

		@Test
		public void setIoCapability() {
		int capability = BluetoothAdapter.IO_CAPABILITY_MAX - 1;
		mBinder.setIoCapability(capability, mAttributionSource);
		verify(mService.mAdapterProperties).setIoCapability(capability);
		}

		@Test
		public void stopRfcommListener() {
		ParcelUuid uuid = ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB");