Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make "cmd package set-home-activity" more CTS friendly" into nyc-mr1-dev

Browse Source
This commit is contained in:
Makoto Onuki
2016-06-24 17:37:06 +00:00
committed by Android (Google) Code Review
parent 27465d7d0e 3bdbf985e1
commit 2a6f79d45f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -1099,8 +1099,9 @@ class PackageManagerShellCommand extends ShellCommand {
try { try {
mInterface.setHomeActivity(componentName, userId); mInterface.setHomeActivity(componentName, userId);
pw.println("Success");
return 0; return 0;
} catch (RemoteException e) { } catch (Exception e) {
pw.println(e.toString()); pw.println(e.toString());
return 1; return 1;
} }

4
services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
View File

@@ -168,7 +168,8 @@ public class ShortcutManagerTestUtils {
} }
public static void setDefaultLauncher(Instrumentation instrumentation, String component) { public static void setDefaultLauncher(Instrumentation instrumentation, String component) {
runCommandForNoOutput(instrumentation, "cmd package set-home-activity " + component); runCommand(instrumentation, "cmd package set-home-activity " + component,
result -> result.contains("Success"));
} }
public static void setDefaultLauncher(Instrumentation instrumentation, Context packageContext) { public static void setDefaultLauncher(Instrumentation instrumentation, Context packageContext) {
@@ -202,6 +203,7 @@ public class ShortcutManagerTestUtils {
if (!ENABLE_DUMPSYS) { if (!ENABLE_DUMPSYS) {
return; return;
} }
Log.e(TAG, "Dumpsys shortcut");
for (String s : runCommand(instrumentation, "dumpsys shortcut")) { for (String s : runCommand(instrumentation, "dumpsys shortcut")) {
Log.e(TAG, s); Log.e(TAG, s);
} }