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

Commit e7e4efd9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07 am:... 

Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07 am: 2918f0ef am: 0e9d68e8 am: e3538bc7 am: bb7304f3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397949

Change-Id: I4016ee65b5dd970d76612db597d3310d909454da
parents 38d016e1 bb7304f3

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java

+1 −7
Original line number Diff line number Diff line
@@ -298,18 +298,12 @@ public class BluetoothEventManager { 
            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);

            if (cachedDevice == null) {

                cachedDevice = mDeviceManager.addDevice(device);

                Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice: "

                        + cachedDevice);

                Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice");

            } else if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED

                    && !cachedDevice.getDevice().isConnected()) {

                // Dispatch device add callback to show bonded but

                // not connected devices in discovery mode

                dispatchDeviceAdded(cachedDevice);

                Log.d(TAG, "DeviceFoundHandler found bonded and not connected device:"

                        + cachedDevice);

            } else {

                Log.d(TAG, "DeviceFoundHandler found existing CachedBluetoothDevice:"

                        + cachedDevice);

            }

            cachedDevice.setRssi(rssi);

            cachedDevice.setJustDiscovered(true);

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+3 −6
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 


    void onProfileStateChanged(LocalBluetoothProfile profile, int newProfileState) {

        if (BluetoothUtils.D) {

            Log.d(TAG, "onProfileStateChanged: profile " + profile + ", device=" + mDevice

                    + ", newProfileState " + newProfileState);

            Log.d(TAG, "onProfileStateChanged: profile " + profile + ", device "

                    + mDevice.getAlias() + ", newProfileState " + newProfileState);

        }

        if (mLocalAdapter.getState() == BluetoothAdapter.STATE_TURNING_OFF)

        {
@@ -290,9 +290,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
    }



    public void setHiSyncId(long id) {

        if (BluetoothUtils.D) {

            Log.d(TAG, "setHiSyncId: mDevice " + mDevice + ", id " + id);

        }

        mHiSyncId = id;

    }
@@ -638,7 +635,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        }



        if (BluetoothUtils.D) {

            Log.e(TAG, "updating profiles for " + mDevice.getAlias() + ", " + mDevice);

            Log.d(TAG, "updating profiles for " + mDevice.getAlias());

            BluetoothClass bluetoothClass = mDevice.getBluetoothClass();



            if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());