Merge "Revert "Add a test line for UsageStats.getTotalTimeVisible()."" into tm-mainline-prod

1 files changed, 2 insertions, 11 deletions

diff --git a/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java b/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
index ed80e302d4e..e9067208b94 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
@@ -1980,13 +1980,11 @@ public class UsageStatsTest {
         final long startTime = System.currentTimeMillis();
 
         launchTestActivity(TEST_APP2_PKG, TEST_APP2_CLASS_PIP);
-        final long sleepTime1 = 500;
-        SystemClock.sleep(sleepTime1);
+        SystemClock.sleep(500);
 
         // TEST_APP_PKG should take focus, pausing the TEST_APP2_CLASS_PIP activity.
         launchTestActivity(TEST_APP_PKG, TEST_APP_CLASS);
-        final long sleepTime2 = 500;
-        SystemClock.sleep(sleepTime2);
+        SystemClock.sleep(500);
 
         mWMStateHelper.waitForActivityState(TEST_APP2_PIP_COMPONENT,
                 WindowManagerState.STATE_PAUSED);
@@ -2029,13 +2027,6 @@ public class UsageStatsTest {
         assertEquals("Unexpected number of activity resumes", 1, resumes);
         assertEquals("Unexpected number of activity pauses", 1, pauses);
         assertEquals("Unexpected number of activity stops", 0, stops);
-
-        final Map<String, UsageStats> map = mUsageStatsManager.queryAndAggregateUsageStats(
-                startTime, endTime);
-        final UsageStats stats = map.get(TEST_APP2_PKG);
-        assertNotNull(stats);
-        final long totalTimeVisible = stats.getTotalTimeVisible();
-        assertLessThan(sleepTime1 + sleepTime2, totalTimeVisible);
     }
 
     @AppModeFull(reason = "No usage events access in instant apps")