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

Unverified Commit d0976cc4 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-14.0.0_r13' of... 

Merge tag 'android-security-14.0.0_r13' of https://android.googlesource.com/platform/packages/apps/Settings into HEAD

Android Security 14.0.0 Release 13 (12199513)

* tag 'android-security-14.0.0_r13' of https://android.googlesource.com/platform/packages/apps/Settings:
  RESTRICT AUTOMERGE FRP bypass defense in App battery usage page

Change-Id: I4f2d5bacddfa48723b9fe6916343c81e01eaab0d
parents 4ae2322c e873e2d1

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

+5 −0
Original line number Diff line number Diff line
@@ -268,6 +268,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment 
        mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);

    }



    @Override

    protected boolean shouldSkipForInitialSUW() {

        return true;

    }



    @Override

    public void onPause() {

        super.onPause();

tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java

+5 −0
Original line number Diff line number Diff line
@@ -472,4 +472,9 @@ public class AdvancedPowerUsageDetailTest { 


        verify(mObserver).onChanged(ChangeReason.UPDATE);

    }



    @Test

    public void shouldSkipForInitialSUW_returnTrue() {

        assertThat(mFragment.shouldSkipForInitialSUW()).isTrue();

    }

}