Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c78c4f46 authored Jan 11, 2019 by Jack He

Metrics: Return empty array for null address in obfuscateAddress()

* Return empty array for null address in obfuscateAddress()

Bug: 112969790
Test: unit test
Change-Id: I00f2a89edcdac838b5f38d8af28952e4e8fa9b62

parent 6f0f00f9

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -2619,9 +2619,13 @@ public class AdapterService extends Service {
		* Obfuscate Bluetooth MAC address into a PII free ID string
		*
		* @param device Bluetooth device whose MAC address will be obfuscated
		* @return a byte array that is unique to this MAC address on this device
		* @return a byte array that is unique to this MAC address on this device,
		* or empty byte array when either device is null or obfuscateAddressNative fails
		*/
		public byte[] obfuscateAddress(BluetoothDevice device) {
		if (device == null) {
		return new byte[0];
		}
		return obfuscateAddressNative(Utils.getByteAddress(device));
		}

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -494,6 +494,17 @@ public class AdapterServiceTest {
		SystemProperties.set(AdapterService.BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, snoopSetting);
		}


		/**
		* Test: Obfuscate a null Bluetooth
		* Check if returned value from {@link AdapterService#obfuscateAddress(BluetoothDevice)} is
		* an empty array when device address is null
		*/
		@Test
		public void testObfuscateBluetoothAddress_NullAddress() {
		Assert.assertArrayEquals(mAdapterService.obfuscateAddress(null), new byte[0]);
		}

		/**
		* Test: Obfuscate Bluetooth address when Bluetooth is disabled
		* Check whether the returned value meets expectation