| commit | 0c097d5c0d32c59c3ea7c802fe964acac7715485 | [log] [tgz] |
|---|---|---|
| author | Yiling Chuang <emilychuang@google.com> | Mon Jul 08 03:09:50 2024 +0000 |
| committer | Yiling Chuang <emilychuang@google.com> | Wed Jul 31 04:04:47 2024 +0000 |
| tree | 0091c452a95adb03285beeb4b40b77a002fc9f9a | |
| parent | 768eef96cfc9699c98afde04fa483e63f05200d6 [diff] |
RESTRICT AUTOMERGE FRP bypass defense in App battery usage page Before the setup flow completion, don't allow the app info page in App battery usage to be launched. Bug: 327748846 Test: atest SettingsRoboTests + manual test - factory reset + launch app battery usage app info via ADB during Setup -> verify app closes Flag : EXEMPT bugfix Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0 Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0 (cherry picked from commit 419a6a907902a12a0f565c808fa70092004d6686)
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 3319e1b..cea6463 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -276,6 +276,11 @@ } } + @Override + protected boolean shouldSkipForInitialSUW() { + return true; + } + @VisibleForTesting void initHeader() { final View appSnippet = mHeaderPreference.findViewById(R.id.entity_header);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index b50e083..d435117 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -780,4 +780,9 @@ new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, "app label") }); } + + @Test + public void shouldSkipForInitialSUW_returnTrue() { + assertThat(mFragment.shouldSkipForInitialSUW()).isTrue(); + } }