Merge "Rename flag identity_address_null_if_unknown to make it a bug fix flag" into main (f2e0eea3) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/BluetoothObexTransport.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ public class BluetoothObexTransport implements ObexTransport {
		return null;
		}
		String identityAddress =
		Flags.identityAddressNullIfUnknown()
		Flags.identityAddressNullIfNotKnown()
		? Utils.getBrEdrAddress(mSocket.getRemoteDevice())
		: mSocket.getRemoteDevice().getIdentityAddress();
		return mSocket.getConnectionType() == BluetoothSocket.TYPE_RFCOMM

+1 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,7 @@ public class A2dpNativeInterface {
		if (device == null) {
		return Utils.getBytesFromAddress("00:00:00:00:00:00");
		}
		if (Flags.identityAddressNullIfUnknown()) {
		if (Flags.identityAddressNullIfNotKnown()) {
		return Utils.getByteBrEdrAddress(device);
		} else {
		return mAdapterService.getByteIdentityAddress(device);

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ public class A2dpSinkNativeInterface {
		}

		private byte[] getByteAddress(BluetoothDevice device) {
		if (Flags.identityAddressNullIfUnknown()) {
		if (Flags.identityAddressNullIfNotKnown()) {
		return Utils.getByteBrEdrAddress(device);
		} else {
		return mAdapterService.getByteIdentityAddress(device);

+3 −3

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ public class AvrcpNativeInterface {

		void setBipClientStatus(BluetoothDevice device, boolean connected) {
		String identityAddress =
		Flags.identityAddressNullIfUnknown()
		Flags.identityAddressNullIfNotKnown()
		? Utils.getBrEdrAddress(device)
		: mAdapterService.getIdentityAddress(device.getAddress());
		setBipClientStatusNative(identityAddress, connected);
		@@ -236,7 +236,7 @@ public class AvrcpNativeInterface {

		boolean disconnectDevice(BluetoothDevice device) {
		String identityAddress =
		Flags.identityAddressNullIfUnknown()
		Flags.identityAddressNullIfNotKnown()
		? Utils.getBrEdrAddress(device)
		: mAdapterService.getIdentityAddress(device.getAddress());
		d("disconnectDevice: identityAddress=" + identityAddress);
		@@ -277,7 +277,7 @@ public class AvrcpNativeInterface {
		void sendVolumeChanged(BluetoothDevice device, int volume) {
		d("sendVolumeChanged: volume=" + volume);
		String identityAddress =
		Flags.identityAddressNullIfUnknown()
		Flags.identityAddressNullIfNotKnown()
		? Utils.getBrEdrAddress(device)
		: mAdapterService.getIdentityAddress(device.getAddress());
		sendVolumeChangedNative(identityAddress, volume);

+3 −3

Original line number	Diff line number	Diff line
		@@ -617,7 +617,7 @@ class AdapterProperties {
		void cleanupPrevBondRecordsFor(BluetoothDevice device) {
		String address = device.getAddress();
		String identityAddress =
		Flags.identityAddressNullIfUnknown()
		Flags.identityAddressNullIfNotKnown()
		? Utils.getBrEdrAddress(device, mService)
		: mService.getIdentityAddress(address);
		int deviceType = mRemoteDevices.getDeviceProperties(device).getDeviceType();
		@@ -633,7 +633,7 @@ class AdapterProperties {
		for (BluetoothDevice existingDevice : mBondedDevices) {
		String existingAddress = existingDevice.getAddress();
		String existingIdentityAddress =
		Flags.identityAddressNullIfUnknown()
		Flags.identityAddressNullIfNotKnown()
		? Utils.getBrEdrAddress(existingDevice, mService)
		: mService.getIdentityAddress(existingAddress);
		int existingDeviceType =
		@@ -1185,7 +1185,7 @@ class AdapterProperties {
		for (BluetoothDevice device : mBondedDevices) {
		String address = device.getAddress();
		String brEdrAddress =
		Flags.identityAddressNullIfUnknown()
		Flags.identityAddressNullIfNotKnown()
		? Utils.getBrEdrAddress(device)
		: mService.getIdentityAddress(address);
		if (brEdrAddress.equals(address)) {