Merge "Redact bluetooth address in GATT framework classes." into main (ee052485) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothGatt.java

+12 −8

Original line number	Diff line number	Diff line
		@@ -370,7 +370,8 @@ public final class BluetoothGatt implements BluetoothProfile {
		+ (" status=" + status)
		+ (" clientIf=" + clientIf)
		+ (" connected=" + connected)
		+ (" device=" + address));
		+ (" device="
		+ BluetoothUtils.toAnonymizedAddress(address)));
		}
		if (!address.equals(mDevice.getAddress())) {
		return;
		@@ -479,7 +480,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		Log.d(
		TAG,
		"onCharacteristicRead() -"
		+ (" Device=" + address)
		+ (" Device=" + BluetoothUtils.toAnonymizedAddress(address))
		+ (" handle=" + handle)
		+ (" Status=" + status));
		}
		@@ -546,7 +547,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		Log.d(
		TAG,
		"onCharacteristicWrite() -"
		+ (" Device=" + address)
		+ (" Device=" + BluetoothUtils.toAnonymizedAddress(address))
		+ (" handle=" + handle)
		+ (" Status=" + status));
		}
		@@ -819,7 +820,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		Log.d(
		TAG,
		"onReadRemoteRssi() -"
		+ (" Device=" + address)
		+ (" Device=" + BluetoothUtils.toAnonymizedAddress(address))
		+ (" rssi=" + rssi)
		+ (" status=" + status));
		}
		@@ -849,7 +850,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		Log.d(
		TAG,
		"onConfigureMTU() -"
		+ (" Device=" + address)
		+ (" Device=" + BluetoothUtils.toAnonymizedAddress(address))
		+ (" mtu=" + mtu)
		+ (" status=" + status));
		}
		@@ -881,7 +882,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		Log.d(
		TAG,
		"onConnectionUpdated() -"
		+ (" Device=" + address)
		+ (" Device=" + BluetoothUtils.toAnonymizedAddress(address))
		+ (" interval=" + interval)
		+ (" latency=" + latency)
		+ (" timeout=" + timeout)
		@@ -916,7 +917,10 @@ public final class BluetoothGatt implements BluetoothProfile {
		@Override
		public void onServiceChanged(String address) {
		if (DBG) {
		Log.d(TAG, "onServiceChanged() - Device=" + address);
		Log.d(
		TAG,
		"onServiceChanged() - Device="
		+ BluetoothUtils.toAnonymizedAddress(address));
		}

		if (!address.equals(mDevice.getAddress())) {
		@@ -951,7 +955,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		Log.d(
		TAG,
		"onSubrateChange() - "
		+ (" Device=" + address)
		+ (" Device=" + BluetoothUtils.toAnonymizedAddress(address))
		+ (" subrateFactor=" + subrateFactor)
		+ (" latency=" + latency)
		+ (" contNum=" + contNum)

framework/java/android/bluetooth/BluetoothGattServer.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		+ " connected="
		+ connected
		+ " device="
		+ address);
		+ BluetoothUtils.toAnonymizedAddress(address));
		}
		try {
		mCallback.onConnectionStateChange(
		@@ -305,7 +305,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		TAG,
		"onExecuteWrite() - "
		+ "device="
		+ address
		+ BluetoothUtils.toAnonymizedAddress(address)
		+ ", transId="
		+ transId
		+ "execWrite="
		@@ -334,7 +334,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		TAG,
		"onNotificationSent() - "
		+ "device="
		+ address
		+ BluetoothUtils.toAnonymizedAddress(address)
		+ ", status="
		+ status);
		}
		@@ -388,7 +388,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		TAG,
		"onPhyUpdate() - "
		+ "device="
		+ address
		+ BluetoothUtils.toAnonymizedAddress(address)
		+ ", txPHy="
		+ txPhy
		+ ", rxPHy="
		@@ -417,7 +417,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		TAG,
		"onPhyUpdate() - "
		+ "device="
		+ address
		+ BluetoothUtils.toAnonymizedAddress(address)
		+ ", txPHy="
		+ txPhy
		+ ", rxPHy="
		@@ -446,7 +446,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		Log.d(
		TAG,
		"onConnectionUpdated() - Device="
		+ address
		+ BluetoothUtils.toAnonymizedAddress(address)
		+ " interval="
		+ interval
		+ " latency="