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

Commit df741494 authored by Omair Kamil's avatar Omair Kamil Committed by Automerger Merge Worker
Browse files

Merge "Redact bluetooth address in GATT framework classes." into main am: ee052485 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3431018



Change-Id: I747aa821e8e2d975ba9e2b663764f391ceef1b37
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 986fbad4 ee052485

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="