summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2017-12-07 18:31:52 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-12-07 18:31:52 +0000
commitff8201b34bc901c9087fffb66b837e44917fd480 (patch)
tree4f41d9dbcd5d3eb20a8d68286fa9376fc13a9d3f /core/java/android
parentc690bb763c12b9ae9859c850f1021430a63a834f (diff)
parent28f32f26b7727aea8855e7e49b2fa6468d73b138 (diff)
Merge changes from topic "predicates_aosp" am: 76c275e7d3
am: 28f32f26b7 Change-Id: Ic3847aeda3c4d9d62432bf5918c83174e409b871
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/InstantAppInfo.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/content/pm/InstantAppInfo.java b/core/java/android/content/pm/InstantAppInfo.java
index 67afc928fd78..cb04fc3ce8e1 100644
--- a/core/java/android/content/pm/InstantAppInfo.java
+++ b/core/java/android/content/pm/InstantAppInfo.java
@@ -18,6 +18,7 @@ package android.content.pm;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SystemApi;
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
@@ -31,6 +32,7 @@ import android.os.Parcelable;
*
* @hide
*/
+@SystemApi
public final class InstantAppInfo implements Parcelable {
private final ApplicationInfo mApplicationInfo;