commit d6880797f72e1e397e18c6e709c0125f795c7d2e
author Makoto Onuki <omakoto@google.com> Wed Jun 29 13:37:43 2016 -0700
committer Makoto Onuki <omakoto@google.com> Wed Jun 29 15:22:56 2016 -0700
tree d014ed9499b8885c983b36b540821311d15a2d0c
parent 038084e61cb85ac09e745e5d64817668606f08d8

Address API council feedback (continued)

Got a second set of comments.

Bug 29757958

Change-Id: Ib3a3ffd28bc3e35eb0218b0819870eb5c6ebadb5

services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java

diff --git a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
index 71d1a3a..7cf03af 100644
--- a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
@@ -1331,8 +1331,8 @@
     protected Intent launchShortcutAndGetIntent(
             @NonNull String packageName, @NonNull String shortcutId, int userId) {
         reset(mServiceContext);
-        assertTrue(mLauncherApps.startShortcut(packageName, shortcutId, null, null,
-                UserHandle.of(userId)));
+        mLauncherApps.startShortcut(packageName, shortcutId, null, null,
+                UserHandle.of(userId));
 
         final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mServiceContext).startActivityAsUser(
@@ -1346,8 +1346,8 @@
             @NonNull String packageName, @NonNull String shortcutId, int userId) {
         reset(mServiceContext);
 
-        assertTrue(mLauncherApps.startShortcut(
-                getShortcutInfoAsLauncher(packageName, shortcutId, userId), null, null));
+        mLauncherApps.startShortcut(
+                getShortcutInfoAsLauncher(packageName, shortcutId, userId), null, null);
 
         final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mServiceContext).startActivityAsUser(
@@ -1363,15 +1363,12 @@
         assertNotNull(launchShortcutAndGetIntent_withShortcutInfo(packageName, shortcutId, userId));
     }
 
+    // TODO Fix all tests using it.
     protected void assertShortcutNotLaunchable(@NonNull String packageName,
             @NonNull String shortcutId, int userId) {
         try {
-            final boolean ok = mLauncherApps.startShortcut(packageName, shortcutId, null, null,
+            mLauncherApps.startShortcut(packageName, shortcutId, null, null,
                     UserHandle.of(userId));
-            if (!ok) {
-                return; // didn't launch, okay.
-            }
-            fail();
         } catch (SecurityException expected) {
             // security exception is okay too.
         }