diff options
| author | 2017-01-11 18:13:00 +0000 | |
|---|---|---|
| committer | 2017-01-11 18:13:04 +0000 | |
| commit | a59e4503a1e407e468f47898e9b227764b842c99 (patch) | |
| tree | b2fcab9ef4d973b35f17cb73510310246f73d9c1 | |
| parent | 0f642d27098a9ab26f51cb7c1bf5e53e374c83c5 (diff) | |
| parent | db3b10a95e18d918927e61fa983c30de7bf069a4 (diff) | |
Merge "Update the javadoc on requestPinShortcut() about multiple..."
| -rw-r--r-- | core/java/android/appwidget/AppWidgetManager.java | 5 | ||||
| -rw-r--r-- | core/java/android/content/pm/LauncherApps.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/ShortcutManager.java | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index 318968158559..31e779f0dc4b 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -1094,8 +1094,9 @@ public class AppWidgetManager { * <p>Only apps with a foreground activity or a foreground service can call it. Otherwise * it'll throw {@link IllegalStateException}. * - * <p>When an app calls this API when a previous request is still waiting for a response, - * the previous request will be canceled. + * <p>It's up to the launcher how to handle previous pending requests when the same package + * calls this API multiple times in a row. It may ignore the previous requests, + * for example. * * @param provider The {@link ComponentName} for the {@link * android.content.BroadcastReceiver BroadcastReceiver} provider for your AppWidget. diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 4b5b995cd218..afd757877603 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -1200,7 +1200,7 @@ public class LauncherApps { /** * Return {@code TRUE} if a request is valid -- i.e. {@link #accept(Bundle)} has not been - * called, and it has not been canceled. + * called yet. */ public boolean isValid() { try { diff --git a/core/java/android/content/pm/ShortcutManager.java b/core/java/android/content/pm/ShortcutManager.java index c8fb3d174fe0..385340000d83 100644 --- a/core/java/android/content/pm/ShortcutManager.java +++ b/core/java/android/content/pm/ShortcutManager.java @@ -846,8 +846,9 @@ public class ShortcutManager { * <p>Only apps with a foreground activity or a foreground service can call it. Otherwise * it'll throw {@link IllegalStateException}. * - * <p>When an app calls this API when a previous request is still waiting for a response, - * the previous request will be canceled. + * <p>It's up to the launcher how to handle previous pending requests when the same package + * calls this API multiple times in a row. It may ignore the previous requests, + * for example. * * @param shortcut New shortcut to pin. If an app wants to pin an existing (either dynamic * or manifest) shortcut, then it only needs to have an ID, and other fields don't have to |