openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Not using shell command to enable test provider" 

This reverts commit 5f80e92bda.

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

Bug: 196586808
Test: presubmit
Change-Id: I078f0d4e83f5f1db19e9e0a5afec4f3058156745
This commit is contained in:
Vadim Tryshev 2021-08-13 21:55:29 +00:00
parent 5f80e92bda
commit 169c4e88cd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@ -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());
}
}
}
}
@ -300,7 +305,7 @@ public final class LauncherInstrumentation {
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) {