From e853dd3104a87c48177a8246bb1d4daaee1baaf8 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Fri, 6 Jan 2023 19:42:46 +0800 Subject: [PATCH] Change all the system items unclickable in battery usage list. Bug: 264643763 Fix: 264643763 Test: manual Change-Id: I5854f9517bfb308142cc5f3c5e5cd8f54a237d59 --- .../settings/fuelgauge/batteryusage/BatteryDiffEntry.java | 2 +- .../fuelgauge/batteryusage/BatteryDiffEntryTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java index 9e0c6d79196..c8577fc5772 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java @@ -272,8 +272,8 @@ public class BatteryDiffEntry { @VisibleForTesting void updateRestrictionFlagState() { - mValidForRestriction = true; if (!mBatteryHistEntry.isAppEntry()) { + mValidForRestriction = false; return; } final boolean isValidPackage = diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java index 4883563f026..1085a6b6d73 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java @@ -168,8 +168,8 @@ public final class BatteryDiffEntryTest { assertThat(nameAndIcon.mName).isEqualTo(expectedName); assertThat(nameAndIcon.mIconId).isEqualTo(R.drawable.ic_settings_aod); // Verifies the restrictable flag in the cache. - assertThat(entry.mValidForRestriction).isTrue(); - assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isTrue(); + assertThat(entry.mValidForRestriction).isFalse(); + assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isFalse(); } @Test @@ -194,8 +194,8 @@ public final class BatteryDiffEntryTest { assertThat(nameAndIcon.mName).isEqualTo(expectedName); assertThat(nameAndIcon.mIconId).isEqualTo(0); // Verifies the restrictable flag in the cache. - assertThat(entry.mValidForRestriction).isTrue(); - assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isTrue(); + assertThat(entry.mValidForRestriction).isFalse(); + assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isFalse(); } @Test