commit 25eb63ac4aeb767eaab3d7462264e959b78d8736
author Varun Shah <varunshah@google.com> Sat Nov 10 00:23:56 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 10 00:23:56 2018 +0000
tree 179daca37bc212597a058b2dab424c2fae19e06a
parent 79f74661f405bd4ffa89acfbb8abef8b7296eb90
parent b9fd6bedbca31cd394f1e43017e6b6b32e1b9fce

Merge "Exposes Intent.METADATA_SETUP_VERSION as SystemApi for SUW."

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 237d4c4..4c975db 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1088,6 +1088,7 @@
     field public static final java.lang.String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";
     field public static final java.lang.String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP";
     field public static final java.lang.String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE";
+    field public static final java.lang.String METADATA_SETUP_VERSION = "android.SETUP_VERSION";
   }
 
   public class IntentFilter implements android.os.Parcelable {

core/java/android/content/Intent.java

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index aa34da8..02f38a7 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1727,10 +1727,14 @@
             = "android.intent.extra.UNINSTALL_ALL_USERS";
 
     /**
-     * A string associated with a {@link #ACTION_UPGRADE_SETUP} activity
-     * describing the last run version of the platform that was setup.
+     * A string that associates with a metadata entry, indicating the last run version of the
+     * platform that was setup.
+     *
+     * @see #ACTION_UPGRADE_SETUP
+     *
      * @hide
      */
+    @SystemApi
     public static final String METADATA_SETUP_VERSION = "android.SETUP_VERSION";
 
     /**