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

Unverified Commit 833a569d authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-13.0.0_r22' into staging/lineage-20.0_android-security-13.0.0_r22 

Android Security 13.0.0 Release 22 (12199512)

* tag 'android-security-13.0.0_r22':
  RESTRICT AUTOMERGE FRP bypass defense in App battery usage page

Change-Id: I2c703dee32dfb7b8b0a6f6e6f1dd4f9c78083256
parents 6eeb7082 a86c441b

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

+5 −0
Original line number Diff line number Diff line
@@ -293,6 +293,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        }

    }



    @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
@@ -895,4 +895,9 @@ public class AdvancedPowerUsageDetailTest { 


        verifyNoInteractions(mBackupManager);

    }



    @Test

    public void shouldSkipForInitialSUW_returnTrue() {

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

    }

}