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

Commit 56ede395 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Change scan mode log from integer to string" into main am: d2256116 

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



Change-Id: I6a08f7d9169ee811993bc790d1375cf098e90f7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5452fb8a d2256116

android/app/src/com/android/bluetooth/le_scan/ScanManager.java

+5 −5
Original line number Diff line number Diff line
@@ -712,9 +712,9 @@ public class ScanManager { 
            Log.d(

                    TAG,

                    "Scan mode update during screen off from "

                            + client.scanModeApp

                            + getScanModeString(client.scanModeApp)

                            + " to "

                            + updatedScanMode);

                            + getScanModeString(updatedScanMode));

            return client.updateScanMode(updatedScanMode);

        }
@@ -828,9 +828,9 @@ public class ScanManager { 
            Log.d(

                    TAG,

                    "Scan mode update during screen on from "

                            + client.scanModeApp

                            + getScanModeString(client.scanModeApp)

                            + " to "

                            + getMinScanMode(scanMode, maxScanMode));

                            + getScanModeString(getMinScanMode(scanMode, maxScanMode)));

            return client.updateScanMode(getMinScanMode(scanMode, maxScanMode));

        }
@@ -2104,7 +2104,7 @@ public class ScanManager { 
                            + " isForeground "

                            + isForeground

                            + " scanMode "

                            + client.settings.getScanMode());

                            + getScanModeString(client.settings.getScanMode()));

        }



        if (updatedScanParams) {