diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-15 21:19:04 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-15 21:19:04 +0000 |
commit | 4a900bc1b791cf447498ce0091c20570a036bcaf (patch) | |
tree | 02083943c9ef961dc6e62f5b55a638ff724236b5 | |
parent | fa0efaa37805af5b539a0e8bdf522377d6d44da3 (diff) | |
parent | c18cfb1ed51330dfff35a6486f1912f8373f94ba (diff) | |
download | StatsD-android-14.0.0_r5.tar.gz |
Snap for 10503246 from c18cfb1ed51330dfff35a6486f1912f8373f94ba to udc-d1-releaseandroid-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-release
Change-Id: I5c193ddc280b52568250722cb8eaf6c0ef655090
-rw-r--r-- | tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java b/tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java index 5b42aa9c..b5baa362 100644 --- a/tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java +++ b/tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java @@ -30,6 +30,7 @@ import com.android.os.AtomsProto.ProcessStatsStateProto; import com.android.os.StatsLog.DimensionsValue; import com.android.os.StatsLog.ValueBucketInfo; import com.android.os.StatsLog.ValueMetricData; +import com.android.tradefed.device.ITestDevice; import com.android.tradefed.log.LogUtil; import java.util.List; @@ -44,6 +45,10 @@ public class ProcStatsValidationTests extends ProcStateTestCase { private static final int EXTRA_WAIT_TIME_MS = 1_000; // as buffer when proc state changing. public void testProcessStatePssValue() throws Exception { + if(isPssProfilingDisabled()) { + LogUtil.CLog.i("testProcessStatePssValue is ignored when PSS profiling is disabled"); + return; + } final String fileName = "PROCSTATSQ_PROCS_STATE_PSS_VALUE.pbtxt"; StatsdConfig config = createValidationUtil().getConfig(fileName); LogUtil.CLog.d("Updating the following config:\n" + config.toString()); @@ -303,4 +308,13 @@ public class ProcStatsValidationTests extends ProcStateTestCase { assertThat(rssAvgStatsd).isEqualTo(rssAvgProcstats); */ } + + private boolean isPssProfilingDisabled() throws Exception { + ITestDevice device = getDevice(); + final String disablePssProfilingKey = "disable_app_profiler_pss_profiling"; + final String stringToCompare = " " + disablePssProfilingKey + "=true"; + + final String dumpsys = device.executeShellCommand("dumpsys activity settings"); + return (dumpsys.contains(stringToCompare)); + } } |