commit ba02896e740741bd8f7cc004ce57aadba9d41256
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 10 07:30:52 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 10 07:30:52 2021 +0000
tree b868365729ade7f6a29feb437ff7e88f4c9d5860
parent 2408471c6d08317b8443c2f486877a72f54ab2b7
parent 949cb34082fecd8e77624733fe02181d7681d5a1

Snap for 7627094 from 949cb34082fecd8e77624733fe02181d7681d5a1 to mainline-permission-release

Change-Id: Ic5b9bd7e34e6192930064e5a29e1ed3c1138c81c

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index de807df..da53cc1 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.scheduling",
-  "version": 1
+  "version": 319999900
 }

tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java

diff --git a/tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java b/tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java
index 443d2f6..31c233a 100644
--- a/tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java
+++ b/tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java
@@ -36,7 +36,6 @@
 
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -91,13 +90,9 @@
     private static HandlerExecutor sHandlerExecutor;
 
     @BeforeClass
-    public static void setupClass() {
+    public static void setupClass() throws Exception {
         sThread.start();
         sHandlerExecutor = new HandlerExecutor(sThread.getThreadHandler());
-    }
-
-    @Before
-    public void setup() {
         adoptShellPermissions();
         DeviceConfig.setProperty(DeviceConfig.NAMESPACE_REBOOT_READINESS,
                 PROPERTY_ACTIVE_POLLING_INTERVAL_MS, "1000", false);
@@ -107,6 +102,8 @@
                 PROPERTY_DISABLE_APP_ACTIVITY_CHECK, "true", false);
         DeviceConfig.setProperty(DeviceConfig.NAMESPACE_REBOOT_READINESS,
                 PROPERTY_DISABLE_SUBSYSTEMS_CHECK, "true", false);
+        // Small delay to allow DeviceConfig changes to propagate.
+        Thread.sleep(1000);
     }
 
     @After
@@ -114,12 +111,12 @@
         mRebootReadinessManager.removeRequestRebootReadinessStatusListener(READY_CALLBACK);
         mRebootReadinessManager.removeRequestRebootReadinessStatusListener(BLOCKING_CALLBACK);
         mRebootReadinessManager.cancelPendingReboot();
-        dropShellPermissions();
     }
 
     @AfterClass
     public static void teardownClass() {
         sThread.quitSafely();
+        dropShellPermissions();
     }
 
     @Test
@@ -264,14 +261,14 @@
         return mRebootReadinessManager.isReadyToReboot();
     }
 
-    private void adoptShellPermissions() {
+    private static void adoptShellPermissions() {
         InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
                 Manifest.permission.REBOOT, Manifest.permission.WRITE_DEVICE_CONFIG,
                 Manifest.permission.SIGNAL_REBOOT_READINESS,
                 Manifest.permission.INTERACT_ACROSS_USERS_FULL);
     }
 
-    private void dropShellPermissions() {
+    private static void dropShellPermissions() {
         InstrumentationRegistry
                 .getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
     }