commit d4f7a0ff05c0c20596c3c2d3d19f4c7d20c60697
author Pedro Loureiro <pedroql@google.com> Tue Jan 19 16:25:00 2021 +0000
committer Pedro Loureiro <pedroql@google.com> Tue Jan 19 16:25:00 2021 +0000
tree 960dce0c53869e50632760984f6e7afc45b7a07a
parent b14f33192aa0a7e61ff75fb09a1fe8ffb78b8842

Revert "Remove workaround disabling hidden api checks - windowmanager"

This reverts commit b14f33192aa0a7e61ff75fb09a1fe8ffb78b8842.

Reason for revert: introduced flakiness into the tests (investigation ongoing)

Change-Id: I1bf3426ddb3beaa2ee0815634523459353d117a2

tests/framework/base/windowmanager/AndroidTest.xml

diff --git a/tests/framework/base/windowmanager/AndroidTest.xml b/tests/framework/base/windowmanager/AndroidTest.xml
index f0cc5e7..247a7ce 100644
--- a/tests/framework/base/windowmanager/AndroidTest.xml
+++ b/tests/framework/base/windowmanager/AndroidTest.xml
@@ -56,19 +56,10 @@
                 value="settings put secure android.car.ENABLE_INITIAL_NOTICE_SCREEN_TO_USER 1" />
     </target_preparer>
 
-    <!-- Enabling change id allows that package to access @TestApi methods -->
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
-        <option name="run-command" value="am compat enable ALLOW_TEST_API_ACCESS android.server.wm.app" />
-        <option name="run-command" value="am compat enable ALLOW_TEST_API_ACCESS android.server.wm.shareuid.a" />
-        <option name="run-command" value="am compat enable ALLOW_TEST_API_ACCESS android.server.wm.shareuid.b" />
-        <option name="run-command" value="am compat enable ALLOW_TEST_API_ACCESS android.server.wm.second" />
-        <option name="run-command" value="am compat enable ALLOW_TEST_API_ACCESS android.server.wm.app27" />
-
-        <option name="teardown-command" value="am compat reset ALLOW_TEST_API_ACCESS android.server.wm.app" />
-        <option name="teardown-command" value="am compat reset ALLOW_TEST_API_ACCESS android.server.wm.shareuid.a" />
-        <option name="teardown-command" value="am compat reset ALLOW_TEST_API_ACCESS android.server.wm.shareuid.b" />
-        <option name="teardown-command" value="am compat reset ALLOW_TEST_API_ACCESS android.server.wm.second" />
-        <option name="teardown-command" value="am compat reset ALLOW_TEST_API_ACCESS android.server.wm.app27" />
+      <!-- Disable hidden API checking, see b/166236554 -->
+        <option name="run-command" value="settings put global hidden_api_policy 1" />
+        <option name="teardown-command" value="settings delete global hidden_api_policy" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">