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

Commit a64d0620 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into udc-dev

parents 5af6aa5e 2659f841

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

+5 −0
Original line number Diff line number Diff line
@@ -279,6 +279,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        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
@@ -817,4 +817,9 @@ public class AdvancedPowerUsageDetailTest { 


        verify(mBackupManager).dataChanged();

    }



    @Test

    public void shouldSkipForInitialSUW_returnTrue() {

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

    }

}