commit 4db9c6597144ae5a163cd4372a10f7e3a99b7b6c
author Makoto Onuki <omakoto@google.com> Tue Jul 19 13:27:18 2016 -0700
committer Makoto Onuki <omakoto@google.com> Tue Jul 19 15:22:06 2016 -0700
tree bcdce4e1cb52740dee222fd6b1e7a4a947566e29
parent b430d92815724bb6868628ecd9e1e3dd4f570caf

Update 25.txt

Bug 30218829

Change-Id: I4a1f0c75710f636b1cc1057baf4d1c935fbf88d1

api/25.txt

diff --git a/api/25.txt b/api/25.txt
index d5f36bd..d7897aa 100644
--- a/api/25.txt
+++ b/api/25.txt
@@ -10066,6 +10066,7 @@
     method public android.os.PersistableBundle getExtras();
     method public java.lang.String getId();
     method public android.content.Intent getIntent();
+    method public android.content.Intent getIntents();
     method public long getLastChangedTimestamp();
     method public java.lang.CharSequence getLongLabel();
     method public java.lang.String getPackage();
@@ -10092,6 +10093,7 @@
     method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);
     method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
     method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);
+    method public android.content.pm.ShortcutInfo.Builder setIntents(android.content.Intent[]);
     method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);
     method public android.content.pm.ShortcutInfo.Builder setRank(int);
     method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.CharSequence);
@@ -10108,6 +10110,7 @@
     method public java.util.List<android.content.pm.ShortcutInfo> getManifestShortcuts();
     method public int getMaxShortcutCountPerActivity();
     method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();
+    method public boolean isRateLimitingActive();
     method public void removeAllDynamicShortcuts();
     method public void removeDynamicShortcuts(java.util.List<java.lang.String>);
     method public void reportShortcutUsed(java.lang.String);

system-api/25.txt

diff --git a/system-api/25.txt b/system-api/25.txt
index 16c75cc..e3c344b 100644
--- a/system-api/25.txt
+++ b/system-api/25.txt
@@ -10491,6 +10491,7 @@
     method public android.os.PersistableBundle getExtras();
     method public java.lang.String getId();
     method public android.content.Intent getIntent();
+    method public android.content.Intent getIntents();
     method public long getLastChangedTimestamp();
     method public java.lang.CharSequence getLongLabel();
     method public java.lang.String getPackage();
@@ -10517,6 +10518,7 @@
     method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);
     method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
     method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);
+    method public android.content.pm.ShortcutInfo.Builder setIntents(android.content.Intent[]);
     method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);
     method public android.content.pm.ShortcutInfo.Builder setRank(int);
     method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.CharSequence);
@@ -10533,6 +10535,7 @@
     method public java.util.List<android.content.pm.ShortcutInfo> getManifestShortcuts();
     method public int getMaxShortcutCountPerActivity();
     method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();
+    method public boolean isRateLimitingActive();
     method public void removeAllDynamicShortcuts();
     method public void removeDynamicShortcuts(java.util.List<java.lang.String>);
     method public void reportShortcutUsed(java.lang.String);