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

Commit 40b48ce1 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Add static method to convert scan mode to string for logging purposes"... 

Merge "Add static method to convert scan mode to string for logging purposes" into main am: db00ffca

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



Change-Id: I2319b907535faf0bf89a5b2d824d703a521c793f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a00be550 db00ffca

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

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.le_scan;



import static android.bluetooth.le.ScanSettings.getScanModeString;



import android.app.ActivityManager;

import android.app.AlarmManager;

import android.app.PendingIntent;
@@ -649,7 +651,7 @@ public class ScanManager { 
            Log.d(

                    TAG,

                    "Scan mode update during setAutoBatchScanClient() to "

                            + ScanSettings.SCAN_MODE_SCREEN_OFF);

                            + getScanModeString(ScanSettings.SCAN_MODE_SCREEN_OFF));

            if (client.stats != null) {

                client.stats.setAutoBatchScan(client.scannerId, true);

            }
@@ -662,7 +664,8 @@ public class ScanManager { 
            client.updateScanMode(client.scanModeApp);

            Log.d(

                    TAG,

                    "Scan mode update during clearAutoBatchScanClient() to " + client.scanModeApp);

                    "Scan mode update during clearAutoBatchScanClient() to "

                            + getScanModeString(client.scanModeApp));

            if (client.stats != null) {

                client.stats.setAutoBatchScan(client.scannerId, false);

            }

framework/java/android/bluetooth/le/ScanSettings.java

+26 −0
Original line number Diff line number Diff line
@@ -465,4 +465,30 @@ public final class ScanSettings implements Parcelable { 
                    mPhy);

        }

    }



    /**

     * Converts scan mode integer into string. For internal use only when logging.

     *

     * @hide

     */

    public static String getScanModeString(int scanMode) {

        switch (scanMode) {

            case SCAN_MODE_OPPORTUNISTIC:

                return "SCAN_MODE_OPPORTUNISTIC";

            case SCAN_MODE_LOW_POWER:

                return "SCAN_MODE_LOW_POWER";

            case SCAN_MODE_BALANCED:

                return "SCAN_MODE_BALANCED";

            case SCAN_MODE_LOW_LATENCY:

                return "SCAN_MODE_LOW_LATENCY";

            case SCAN_MODE_AMBIENT_DISCOVERY:

                return "SCAN_MODE_AMBIENT_DISCOVERY";

            case SCAN_MODE_SCREEN_OFF:

                return "SCAN_MODE_SCREEN_OFF";

            case SCAN_MODE_SCREEN_OFF_BALANCED:

                return "SCAN_MODE_SCREEN_OFF_BALANCED";

            default:

                return "UNKNOWN value=" + scanMode;

        }

    }

}