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

Commit 8c6088f2 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[redact_log] redact address in logs in BluetoothGatt[Server]" am: 5fae6b6e am: a1dad2f6 

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



Change-Id: I1b1d6a38e83406c2cb4d8f2ca23a964c66afab77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 488016f1 a1dad2f6

framework/java/android/bluetooth/BluetoothGatt.java

+11 −11
Original line number Original line Diff line number Diff line
@@ -1046,7 +1046,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
            Handler handler) {

            Handler handler) {

        if (DBG) {

        if (DBG) {

            Log.d(TAG,

            Log.d(TAG,

                    "connect() - device: " + mDevice.getAddress() + ", auto: " + autoConnect);

                    "connect() - device: " + mDevice + ", auto: " + autoConnect);

        }

        }

        synchronized (mStateLock) {

        synchronized (mStateLock) {

            if (mConnState != CONN_STATE_IDLE) {

            if (mConnState != CONN_STATE_IDLE) {
@@ -1077,7 +1077,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void disconnect() {

    public void disconnect() {

        if (DBG) Log.d(TAG, "cancelOpen() - device: " + mDevice.getAddress());

        if (DBG) Log.d(TAG, "cancelOpen() - device: " + mDevice);

        if (mService == null || mClientIf == 0) return;

        if (mService == null || mClientIf == 0) return;





        try {

        try {
@@ -1103,7 +1103,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    public boolean connect() {

    public boolean connect() {

        try {

        try {

            if (DBG) {

            if (DBG) {

                Log.d(TAG, "connect(void) - device: " + mDevice.getAddress()

                Log.d(TAG, "connect(void) - device: " + mDevice

                        + ", auto=" + mAutoConnect);

                        + ", auto=" + mAutoConnect);

            }

            }
@@ -1191,7 +1191,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean discoverServices() {

    public boolean discoverServices() {

        if (DBG) Log.d(TAG, "discoverServices() - device: " + mDevice.getAddress());

        if (DBG) Log.d(TAG, "discoverServices() - device: " + mDevice);

        if (mService == null || mClientIf == 0) return false;

        if (mService == null || mClientIf == 0) return false;





        mServices.clear();

        mServices.clear();
@@ -1220,7 +1220,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean discoverServiceByUuid(UUID uuid) {

    public boolean discoverServiceByUuid(UUID uuid) {

        if (DBG) Log.d(TAG, "discoverServiceByUuid() - device: " + mDevice.getAddress());

        if (DBG) Log.d(TAG, "discoverServiceByUuid() - device: " + mDevice);

        if (mService == null || mClientIf == 0) return false;

        if (mService == null || mClientIf == 0) return false;





        mServices.clear();

        mServices.clear();
@@ -1662,7 +1662,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean beginReliableWrite() {

    public boolean beginReliableWrite() {

        if (VDBG) Log.d(TAG, "beginReliableWrite() - device: " + mDevice.getAddress());

        if (VDBG) Log.d(TAG, "beginReliableWrite() - device: " + mDevice);

        if (mService == null || mClientIf == 0) return false;

        if (mService == null || mClientIf == 0) return false;





        try {

        try {
@@ -1692,7 +1692,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean executeReliableWrite() {

    public boolean executeReliableWrite() {

        if (VDBG) Log.d(TAG, "executeReliableWrite() - device: " + mDevice.getAddress());

        if (VDBG) Log.d(TAG, "executeReliableWrite() - device: " + mDevice);

        if (mService == null || mClientIf == 0) return false;

        if (mService == null || mClientIf == 0) return false;





        synchronized (mDeviceBusyLock) {

        synchronized (mDeviceBusyLock) {
@@ -1726,7 +1726,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void abortReliableWrite() {

    public void abortReliableWrite() {

        if (VDBG) Log.d(TAG, "abortReliableWrite() - device: " + mDevice.getAddress());

        if (VDBG) Log.d(TAG, "abortReliableWrite() - device: " + mDevice);

        if (mService == null || mClientIf == 0) return;

        if (mService == null || mClientIf == 0) return;





        try {

        try {
@@ -1801,7 +1801,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean refresh() {

    public boolean refresh() {

        if (DBG) Log.d(TAG, "refresh() - device: " + mDevice.getAddress());

        if (DBG) Log.d(TAG, "refresh() - device: " + mDevice);

        if (mService == null || mClientIf == 0) return false;

        if (mService == null || mClientIf == 0) return false;





        try {

        try {
@@ -1828,7 +1828,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean readRemoteRssi() {

    public boolean readRemoteRssi() {

        if (DBG) Log.d(TAG, "readRssi() - device: " + mDevice.getAddress());

        if (DBG) Log.d(TAG, "readRssi() - device: " + mDevice);

        if (mService == null || mClientIf == 0) return false;

        if (mService == null || mClientIf == 0) return false;





        try {

        try {
@@ -1860,7 +1860,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean requestMtu(int mtu) {

    public boolean requestMtu(int mtu) {

        if (DBG) {

        if (DBG) {

            Log.d(TAG, "configureMTU() - device: " + mDevice.getAddress()

            Log.d(TAG, "configureMTU() - device: " + mDevice

                    + " mtu: " + mtu);

                    + " mtu: " + mtu);

        }

        }

        if (mService == null || mClientIf == 0) return false;

        if (mService == null || mClientIf == 0) return false;

framework/java/android/bluetooth/BluetoothGattServer.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -626,7 +626,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    public boolean connect(BluetoothDevice device, boolean autoConnect) {

    public boolean connect(BluetoothDevice device, boolean autoConnect) {

        if (DBG) {

        if (DBG) {

            Log.d(TAG,

            Log.d(TAG,

                    "connect() - device: " + device.getAddress() + ", auto: " + autoConnect);

                    "connect() - device: " + device + ", auto: " + autoConnect);

        }

        }

        if (mService == null || mServerIf == 0) return false;

        if (mService == null || mServerIf == 0) return false;
@@ -654,7 +654,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void cancelConnection(BluetoothDevice device) {

    public void cancelConnection(BluetoothDevice device) {

        if (DBG) Log.d(TAG, "cancelConnection() - device: " + device.getAddress());

        if (DBG) Log.d(TAG, "cancelConnection() - device: " + device);

        if (mService == null || mServerIf == 0) return;

        if (mService == null || mServerIf == 0) return;





        try {

        try {
@@ -739,7 +739,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean sendResponse(BluetoothDevice device, int requestId,

    public boolean sendResponse(BluetoothDevice device, int requestId,

            int status, int offset, byte[] value) {

            int status, int offset, byte[] value) {

        if (VDBG) Log.d(TAG, "sendResponse() - device: " + device.getAddress());

        if (VDBG) Log.d(TAG, "sendResponse() - device: " + device);

        if (mService == null || mServerIf == 0) return false;

        if (mService == null || mServerIf == 0) return false;





        try {

        try {
@@ -818,7 +818,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    public int notifyCharacteristicChanged(@NonNull BluetoothDevice device,

    public int notifyCharacteristicChanged(@NonNull BluetoothDevice device,

            @NonNull BluetoothGattCharacteristic characteristic, boolean confirm,

            @NonNull BluetoothGattCharacteristic characteristic, boolean confirm,

            @NonNull byte[] value) {

            @NonNull byte[] value) {

        if (VDBG) Log.d(TAG, "notifyCharacteristicChanged() - device: " + device.getAddress());

        if (VDBG) Log.d(TAG, "notifyCharacteristicChanged() - device: " + device);

        if (mService == null || mServerIf == 0) {

        if (mService == null || mServerIf == 0) {

            return BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND;

            return BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND;

        }

        }