From 5013f4f9f87497c0245a32868fe9a79fe76e0392 Mon Sep 17 00:00:00 2001 From: Wesley Wang Date: Wed, 1 Mar 2023 18:24:47 +0800 Subject: Apply extra saver confirmation dialog once required (1/2) - Disable orignal confirmation dialog once extra confirmation exist - Rename config Bug: 260380584 Test: atest SystemUITests Change-Id: I593f68e590fd5f800f32ff55a08a62056843b405 --- .../android/settingslib/fuelgauge/BatterySaverUtils.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'packages/SettingsLib/src') diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java index 28353ab7dff4..52f3111d967c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java @@ -169,8 +169,11 @@ public class BatterySaverUtils { */ public static boolean maybeShowBatterySaverConfirmation(Context context, Bundle extras) { if (Secure.getInt(context.getContentResolver(), - Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 0) != 0) { - return false; // Already shown. + Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 0) != 0 + && Secure.getInt(context.getContentResolver(), + Secure.EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED, 0) != 0) { + // Already shown. + return false; } context.sendBroadcast( getSystemUiBroadcast(ACTION_SHOW_START_SAVER_CONFIRMATION, extras)); @@ -190,8 +193,10 @@ public class BatterySaverUtils { } private static void setBatterySaverConfirmationAcknowledged(Context context) { - Secure.putIntForUser(context.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 1, - UserHandle.USER_CURRENT); + Secure.putIntForUser(context.getContentResolver(), + Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 1, UserHandle.USER_CURRENT); + Secure.putIntForUser(context.getContentResolver(), + Secure.EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED, 1, UserHandle.USER_CURRENT); } /** -- cgit v1.2.3-59-g8ed1b