commit 169c4e88cd203d80756ea8108c5a1daf59279cc5
author Vadim Tryshev <vadimt@google.com> Fri Aug 13 21:55:29 2021 +0000
committer Vadim Tryshev <vadimt@google.com> Fri Aug 13 21:56:07 2021 +0000
tree 23e835bd1a5dc5c56b660752ae08fd02b4dc38e9
parent 5f80e92bda9f658e149d38a4e6ee4db270677784

Revert "Not using shell command to enable test provider"

This reverts commit 5f80e92bda9f658e149d38a4e6ee4db270677784.

Reason for revert: We need to see if this has caused b/196586808

Bug: 196586808
Test: presubmit
Change-Id: I078f0d4e83f5f1db19e9e0a5afec4f3058156745

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 065af00..8b9ae69 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -66,6 +66,7 @@
 
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.systemui.shared.system.ContextUtils;
 import com.android.systemui.shared.system.QuickStepContract;
 
 import org.junit.Assert;
@@ -245,12 +246,16 @@
         ComponentName cn = new ComponentName(pi.packageName, pi.name);
 
         if (pm.getComponentEnabledSetting(cn) != COMPONENT_ENABLED_STATE_ENABLED) {
-            mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
-                    android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE);
-            try {
+            if (TestHelpers.isInLauncherProcess()) {
                 pm.setComponentEnabledSetting(cn, COMPONENT_ENABLED_STATE_ENABLED, DONT_KILL_APP);
-            } finally {
-                mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+            } else {
+                try {
+                    final int userId = ContextUtils.getUserId(getContext());
+                    mDevice.executeShellCommand(
+                            "pm enable --user " + userId + " " + cn.flattenToString());
+                } catch (IOException e) {
+                    fail(e.toString());
+                }
             }
         }
     }
@@ -300,7 +305,7 @@
 
     public boolean isTwoPanels() {
         return getTestInfo(TestProtocol.REQUEST_IS_TWO_PANELS)
-                .getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD);
+            .getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD);
     }
 
     private void setForcePauseTimeout(long timeout) {