commit ffee517437a5e6e97bf765c95688873db25655f4
author Makoto Onuki <omakoto@google.com> Tue Apr 12 09:54:36 2016 -0700
committer Makoto Onuki <omakoto@google.com> Tue Apr 12 13:15:21 2016 -0700
tree b4c35e7e857994b96940011e99d5c50830e1453e
parent a1f3a1d7046dafa9d2098428d690065f9a4402e9

ShortcutManager: Address API review feedback.

Bug 27923857

Change-Id: I62689a438d26f873dddbbc66f0245b1f69f819c6

tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerSpoofDetectionTest.java

diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerSpoofDetectionTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerSpoofDetectionTest.java
index 85f618e..c3530c9 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerSpoofDetectionTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerSpoofDetectionTest.java
@@ -26,6 +26,9 @@
 import android.content.pm.ShortcutInfo;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.ParcelFileDescriptor;
+
+import java.io.IOException;
 
 public class ShortcutManagerSpoofDetectionTest extends ShortcutManagerCtsTestsBase {
 
@@ -53,13 +56,13 @@
             getManager().setDynamicShortcuts(list(makeShortcut("s1")));
         });
         assertCallingPackageMismatch("addDynamicShortcut", mPackageContext4, () -> {
-            getManager().addDynamicShortcut(makeShortcut("s1"));
+            getManager().addDynamicShortcuts(list(makeShortcut("s1")));
         });
         assertCallingPackageMismatch("deleteDynamicShortcut", mPackageContext4, () -> {
-            getManager().deleteDynamicShortcut("s1");
+            getManager().removeDynamicShortcuts(list("s1"));
         });
         assertCallingPackageMismatch("deleteAllDynamicShortcuts", mPackageContext4, () -> {
-            getManager().deleteAllDynamicShortcuts();
+            getManager().removeAllDynamicShortcuts();
         });
         assertCallingPackageMismatch("getDynamicShortcuts", mPackageContext4, () -> {
             getManager().getDynamicShortcuts();
@@ -104,19 +107,20 @@
                     mPackageContext1.getPackageName(), list(), getUserHandle());
         });
 
-        assertCallingPackageMismatch("getShortcutIconResId 1", mLauncherContext4, () -> {
-            getLauncherApps().getShortcutIconResId(makeShortcut("s"));
+        assertCallingPackageMismatch("getShortcutIconFd 1", mLauncherContext4, () -> {
+            ParcelFileDescriptor pfd = getLauncherApps().getShortcutIconFd(makeShortcut("s"));
+            try {
+                pfd.close();
+            } catch (IOException e) {
+            }
         });
-        assertCallingPackageMismatch("getShortcutIconResId 2", mLauncherContext4, () -> {
-            getLauncherApps().getShortcutIconResId(mPackageContext1.getPackageName(), "s1",
-                    getUserHandle());
-        });
-        assertCallingPackageMismatch("getShortcutIconResId 1", mLauncherContext4, () -> {
-            getLauncherApps().getShortcutIconResId(makeShortcut("s"));
-        });
-        assertCallingPackageMismatch("getShortcutIconResId 2", mLauncherContext4, () -> {
-            getLauncherApps().getShortcutIconResId(mPackageContext1.getPackageName(), "s1",
-                    getUserHandle());
+        assertCallingPackageMismatch("getShortcutIconFd 2", mLauncherContext4, () -> {
+            ParcelFileDescriptor pfd = getLauncherApps().getShortcutIconFd(
+                    mPackageContext1.getPackageName(), "s1", getUserHandle());
+            try {
+                pfd.close();
+            } catch (IOException e) {
+            }
         });
 
         assertCallingPackageMismatch("startShortcut 1", mLauncherContext4, () -> {

tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerThrottlingTest.java

diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerThrottlingTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerThrottlingTest.java
index d22af6d..4b2433f 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerThrottlingTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/ShortcutManagerThrottlingTest.java
@@ -56,7 +56,7 @@
     }
 
     private void clearDynamicShortcuts() {
-        getManager().deleteAllDynamicShortcuts();
+        getManager().removeAllDynamicShortcuts();
         assertEquals(0, getManager().getDynamicShortcuts().size());
     }
 
@@ -174,9 +174,9 @@
 
     public void testNotThrottled_delete() {
         runWithCaller(mPackageContext1, () -> {
-            checkNotThrottled(() -> getManager().deleteAllDynamicShortcuts());
+            checkNotThrottled(() -> getManager().removeAllDynamicShortcuts());
 
-            checkNotThrottled(() -> getManager().deleteDynamicShortcut("s1"));
+            checkNotThrottled(() -> getManager().removeDynamicShortcuts(list("s1")));
         });
     }