summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMehdi Alizadeh <mett@google.com>2019-02-25 21:02:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-25 21:02:11 +0000
commit6d4ce1e5bbacd3748ebb7eedd5bdc9faf9196184 (patch)
tree01b57ef207bbcd64afa908f392196436db6d7155 /core/java/android
parenta984bb74b10f54ad7dae1964ef85c54fe014b4e2 (diff)
parent8887365f2a435c56c54611829ee27d12a427c208 (diff)
Merge "Make ShortcutInfo@getPersons() systemApi"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/ShortcutInfo.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/content/pm/ShortcutInfo.java b/core/java/android/content/pm/ShortcutInfo.java
index b1553250d638..e674b8b7fd3d 100644
--- a/core/java/android/content/pm/ShortcutInfo.java
+++ b/core/java/android/content/pm/ShortcutInfo.java
@@ -18,6 +18,7 @@ package android.content.pm;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.annotation.UserIdInt;
@@ -1482,6 +1483,7 @@ public final class ShortcutInfo implements Parcelable {
* @hide
*/
@Nullable
+ @SystemApi
public Person[] getPersons() {
return clonePersons(mPersons);
}