From ec90572f75b09b5b388928c719da303c7f23a2ec Mon Sep 17 00:00:00 2001 From: Ting-Kang Chang Date: Wed, 8 Mar 2023 14:29:25 +0800 Subject: [PATCH] Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating. Bug: 271665638 Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge" Change-Id: I1c9cc3cfcb54051223df2ad46947d7f0c1ebbdb0 --- .../settings/fuelgauge/BatteryBroadcastReceiver.java | 9 +++++++++ .../fuelgauge/TopLevelBatteryPreferenceController.java | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java index ecc4ea0692b..81a15ca7275 100644 --- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java +++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java @@ -116,12 +116,21 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver { return; } final String action = intent.getAction(); + Log.d(TAG, "updateBatteryStatus: action=" + action); if (Intent.ACTION_BATTERY_CHANGED.equals(action)) { final String batteryLevel = Utils.getBatteryPercentage(intent); final String batteryStatus = Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false); final int batteryHealth = intent.getIntExtra( BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_UNKNOWN); + Log.d( + TAG, + "Battery changed: level=" + + batteryLevel + + ", status=" + + batteryStatus + + ", health=" + + batteryHealth); if (!Utils.isBatteryPresent(intent)) { Log.w(TAG, "Problem reading the battery meter."); mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_NOT_PRESENT); diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java index 7f314d16799..5bec7bd4aae 100644 --- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; import android.content.ComponentName; import android.content.Context; +import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -34,6 +35,8 @@ import com.android.settingslib.utils.ThreadUtils; public class TopLevelBatteryPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, BatteryPreferenceController { + private static final String TAG = "TopLvBatteryPrefControl"; + @VisibleForTesting protected boolean mIsBatteryPresent = true; @VisibleForTesting @@ -47,6 +50,7 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle super(context, preferenceKey); mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext); mBatteryBroadcastReceiver.setBatteryChangedListener(type -> { + Log.d(TAG, "onBatteryChanged: type=" + type); if (type == BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_NOT_PRESENT) { mIsBatteryPresent = false; } @@ -101,6 +105,8 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle return null; } + Log.d(TAG, "getDashboardLabel: batteryStatusUpdate=" + batteryStatusUpdate); + if (batteryStatusUpdate) { setSummaryAsync(info); } @@ -137,6 +143,7 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle /** * Callback which receives text for the label. */ + @Override public void updateBatteryStatus(String label, BatteryInfo info) { mBatteryStatusLabel = label; // Null if adaptive charging is not active