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

Commit bb08a43a authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "Fix and re-enable BstatsCpuTimesValidationTest" into sc-dev am: 31c36229 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13930617

Change-Id: I7b38ec25c3f543fce878b021317e93675a853be1
parents 935453c0 31c36229

core/tests/coretests/BstatsTestApp/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />



    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25"/>

    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26"/>



    <application>

        <activity android:name=".TestActivity"

core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java

+4 −3
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ public class BstatsCpuTimesValidationTest { 
        sContext.getPackageManager().setApplicationEnabledSetting(TEST_PKG,

                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);

        sTestPkgUid = sContext.getPackageManager().getPackageUid(TEST_PKG, 0);

        executeCmd("cmd deviceidle whitelist +" + TEST_PKG);



        final ArrayMap<String, String> desiredConstants = new ArrayMap<>();

        desiredConstants.put(KEY_TRACK_CPU_TIMES_BY_PROC_STATE, Boolean.toString(true));
@@ -134,6 +135,7 @@ public class BstatsCpuTimesValidationTest { 


    @AfterClass

    public static void tearDownOnce() throws Exception {

        executeCmd("cmd deviceidle whitelist -" + TEST_PKG);

        if (sBatteryStatsConstsUpdated) {

            Settings.Global.putString(sContext.getContentResolver(),

                    Settings.Global.BATTERY_STATS_CONSTANTS, sOriginalBatteryStatsConsts);
@@ -382,7 +384,7 @@ public class BstatsCpuTimesValidationTest { 
    }



    @Test

    @SkipPresubmit("b/180015146 flakey")

    @SkipPresubmit("b/183225190 flaky")

    public void testCpuFreqTimes_stateFgService() throws Exception {

        if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {

            Log.w(TAG, "Skipping " + testName.getMethodName()
@@ -515,7 +517,6 @@ public class BstatsCpuTimesValidationTest { 
    }



    @Test

    @SkipPresubmit("b/180015146")

    public void testCpuFreqTimes_trackingDisabled() throws Exception {

        if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {

            Log.w(TAG, "Skipping " + testName.getMethodName()
@@ -625,7 +626,7 @@ public class BstatsCpuTimesValidationTest { 
        splitter.setString(settingsDump);

        String next;

        while (splitter.hasNext()) {

            next = splitter.next();

            next = splitter.next().trim();

            if (next.startsWith(key)) {

                return next.split("=")[1];

            }