commit 996b2083da1181fbfb61c6993329b84f9218099c
author Sudheer Shanka <sudheersai@google.com> Mon Oct 03 21:09:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 03 21:09:13 2016 +0000
tree 1d8c69e745544ca81ff7cb4066ac706bb970b1b4
parent 4ed0046cc5ecd367a079351a347f6472bdc30cae
parent 501247bab13b558b29c1fde65dc9d2ed3e4653ac

Merge "Fix flaky test."

services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java

diff --git a/services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java b/services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java
index da4d150..e4473ad 100644
--- a/services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java
@@ -147,6 +147,7 @@
         userInfo.id = TEST_DEMO_USER;
         when(mUm.createUser(anyString(), anyInt())).thenReturn(userInfo);
 
+        setCameraPackage(TEST_CAMERA_PKG);
         mService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);
         assertEquals(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED + " property not set",
                 "1", mInjector.systemPropertiesGet(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED));
@@ -157,7 +158,6 @@
         assertTrue("Not registered for " + Intent.ACTION_SCREEN_OFF,
                 intentFilter.getValue().hasAction(Intent.ACTION_SCREEN_OFF));
 
-        setCameraPackage(TEST_CAMERA_PKG);
         // Wait for the setup to complete.
         mLatch.await(SETUP_COMPLETE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
         ArgumentCaptor<Integer> flags = ArgumentCaptor.forClass(Integer.class);