Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 169c4e88 authored by Vadim Tryshev's avatar Vadim Tryshev
Browse files

Revert "Not using shell command to enable test provider" 

This reverts commit 5f80e92b.

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

Bug: 196586808
Test: presubmit
Change-Id: I078f0d4e83f5f1db19e9e0a5afec4f3058156745
parent 5f80e92b

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

+11 −6
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import androidx.test.uiautomator.Until; 


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 @@ public final class LauncherInstrumentation { 
        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());

                }

            }

        }

    }