Merge "KLP/KitKat is now API 19." into klp-dev

2 files changed, 18 insertions, 8 deletions

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 02ccaa5ace22..50401bd9c902 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1657,9 +1657,8 @@ public abstract class Context {
      * Request that a given application service be started.  The Intent
      * should contain either contain the complete class name of a specific service
      * implementation to start or a specific package name to target.  If the
-     * Intent is less specified, it will either throw an {@link IllegalArgumentException}
-     * (if the caller targets {@link android.os.Build.VERSION_CODES#KITKAT} or later),
-     * or which of multiple matching services it finds and uses will be undefined.  If this service
+     * Intent is less specified, it log a warning about this and which of the
+     * multiple matching services it finds and uses will be undefined.  If this service
      * is not already running, it will be instantiated and started (creating a
      * process for it if needed); if it is running then it remains running.
      *
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 88eb280afb40..114a1ea69035 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -438,17 +438,28 @@ public class Build {
         public static final int JELLY_BEAN_MR2 = 18;
 
         /**
-         * Android X.X: KitKat, another tasty treat.
+         * Android 4.4: KitKat, another tasty treat.
          *
          * <p>Applications targeting this or a later release will get these
          * new changes in behavior:</p>
          * <ul>
-         * <li>It is no longer allowed to use implicit intents with
-         * {@link android.content.Context#startService} or
-         * {@link android.content.Context#bindService}.
+         * <li> The default result of {android.preference.PreferenceActivity#isValidFragment
+         * PreferenceActivity.isValueFragment} becomes false instead of true.</li>
+         * <li> In {@link android.webkit.WebView}, apps targeting earlier versions will have
+         * JS URLs evaluated directly and any result of the evaluation will not replace
+         * the current page content.  Apps targetting KITKAT or later that load a JS URL will
+         * have the result of that URL replace the content of the current page</li>
+         * <li> {@link android.app.AlarmManager#set AlarmManager.set} becomes interpreted as
+         * an inexact value, to give the system more flexibility in scheduling alarms.</li>
+         * <li> {@link android.content.Context#getSharedPreferences(String, int)
+         * Context.getSharedPreferences} no longer allows a null name.</li>
+         * <li> {@link android.widget.RelativeLayout} changes to compute wrapped content
+         * margins correctly.</li>
+         * <li> {@link android.app.ActionBar}'s window content overlay is allowed to be
+         * drawn.</li>
          * </ul>
          */
-        public static final int KITKAT = CUR_DEVELOPMENT;
+        public static final int KITKAT = 19;
     }
     
     /** The type of build, like "user" or "eng". */