Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix and re-enable BstatsCpuTimesValidationTest" into sc-dev

Browse Source
This commit is contained in:
Dmitri Plotnikov
2021-03-19 22:40:02 +00:00
committed by Android (Google) Code Review
parent a5a930725f 9e5cf848fc
commit 31c3622909
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/coretests/BstatsTestApp/AndroidManifest.xml
View File

@@ -19,7 +19,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <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> <application>
<activity android:name=".TestActivity" <activity android:name=".TestActivity"

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

@@ -124,6 +124,7 @@ public class BstatsCpuTimesValidationTest {
sContext.getPackageManager().setApplicationEnabledSetting(TEST_PKG, sContext.getPackageManager().setApplicationEnabledSetting(TEST_PKG,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0); PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
sTestPkgUid = sContext.getPackageManager().getPackageUid(TEST_PKG, 0); sTestPkgUid = sContext.getPackageManager().getPackageUid(TEST_PKG, 0);
executeCmd("cmd deviceidle whitelist +" + TEST_PKG);
final ArrayMap<String, String> desiredConstants = new ArrayMap<>(); final ArrayMap<String, String> desiredConstants = new ArrayMap<>();
desiredConstants.put(KEY_TRACK_CPU_TIMES_BY_PROC_STATE, Boolean.toString(true)); desiredConstants.put(KEY_TRACK_CPU_TIMES_BY_PROC_STATE, Boolean.toString(true));
@@ -134,6 +135,7 @@ public class BstatsCpuTimesValidationTest {
@AfterClass @AfterClass
public static void tearDownOnce() throws Exception { public static void tearDownOnce() throws Exception {
executeCmd("cmd deviceidle whitelist -" + TEST_PKG);
if (sBatteryStatsConstsUpdated) { if (sBatteryStatsConstsUpdated) {
Settings.Global.putString(sContext.getContentResolver(), Settings.Global.putString(sContext.getContentResolver(),
Settings.Global.BATTERY_STATS_CONSTANTS, sOriginalBatteryStatsConsts); Settings.Global.BATTERY_STATS_CONSTANTS, sOriginalBatteryStatsConsts);
@@ -382,7 +384,7 @@ public class BstatsCpuTimesValidationTest {
} }
@Test @Test
@SkipPresubmit("b/180015146 flakey") @SkipPresubmit("b/183225190 flaky")
public void testCpuFreqTimes_stateFgService() throws Exception { public void testCpuFreqTimes_stateFgService() throws Exception {
if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) { if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {
Log.w(TAG, "Skipping " + testName.getMethodName() Log.w(TAG, "Skipping " + testName.getMethodName()
@@ -515,7 +517,6 @@ public class BstatsCpuTimesValidationTest {
} }
@Test @Test
@SkipPresubmit("b/180015146")
public void testCpuFreqTimes_trackingDisabled() throws Exception { public void testCpuFreqTimes_trackingDisabled() throws Exception {
if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) { if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {
Log.w(TAG, "Skipping " + testName.getMethodName() Log.w(TAG, "Skipping " + testName.getMethodName()
@@ -625,7 +626,7 @@ public class BstatsCpuTimesValidationTest {
splitter.setString(settingsDump); splitter.setString(settingsDump);
String next; String next;
while (splitter.hasNext()) { while (splitter.hasNext()) {
next = splitter.next(); next = splitter.next().trim();
if (next.startsWith(key)) { if (next.startsWith(key)) {
return next.split("=")[1]; return next.split("=")[1];
} }