diff options
| author | 2021-01-30 17:01:40 +0000 | |
|---|---|---|
| committer | 2021-01-30 17:01:40 +0000 | |
| commit | 2102bd8448fa2d0b9e67db9f7a12f1af596e90a0 (patch) | |
| tree | b1fd991b73649e7767b54476149ee544fe3dccbe | |
| parent | eeda0eb19321cfc53e001d3f7db6a238e7e9cf15 (diff) | |
| parent | ecbb7319f87fce3822e0583ff8115863a0aca6c8 (diff) | |
Merge "Expose PendingIntent APIs for exposing component/type for CTS" into sc-dev
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/PendingIntent.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ea7dc03c4007..db31d08100c0 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -281,6 +281,7 @@ package android.app { } public final class PendingIntent implements android.os.Parcelable { + method @Nullable @RequiresPermission("android.permission.GET_INTENT_SENDER_INTENT") public java.util.List<android.content.pm.ResolveInfo> queryIntentComponents(int); field @Deprecated public static final int FLAG_MUTABLE_UNAUDITED = 33554432; // 0x2000000 } diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index 86352225292e..534f3e25acde 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -1277,6 +1277,7 @@ public final class PendingIntent implements Parcelable { */ @RequiresPermission(permission.GET_INTENT_SENDER_INTENT) @SystemApi(client = Client.MODULE_LIBRARIES) + @TestApi public @Nullable List<ResolveInfo> queryIntentComponents(@ResolveInfoFlags int flags) { try { return ActivityManager.getService() |