From 6bc3789b3982d25bf3fc09d257efa6cdb628e7f2 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 3 Oct 2013 11:05:14 -0700 Subject: [PATCH] KLP/KitKat is now API 19. Bug: 10348975 Change-Id: I19bf1a56064deda2e59085520960aac8ce3a825b --- api/current.txt | 2 +- core/java/android/content/Context.java | 5 ++- core/java/android/os/Build.java | 21 ++++++++++--- core/res/res/values/public.xml | 42 +++++++++++++------------- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/api/current.txt b/api/current.txt index 2ed9c5890a39c..3dee14f409cd0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17849,7 +17849,7 @@ package android.os { field public static final int JELLY_BEAN = 16; // 0x10 field public static final int JELLY_BEAN_MR1 = 17; // 0x11 field public static final int JELLY_BEAN_MR2 = 18; // 0x12 - field public static final int KITKAT = 10000; // 0x2710 + field public static final int KITKAT = 19; // 0x13 } public final class Bundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 02ccaa5ace224..50401bd9c9020 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 88eb280afb40c..114a1ea69035c 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. * *

Applications targeting this or a later release will get these * new changes in behavior:

* */ - public static final int KITKAT = CUR_DEVELOPMENT; + public static final int KITKAT = 19; } /** The type of build, like "user" or "eng". */ diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index ef7f2b7abc5d2..431fe82c585f7 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2054,29 +2054,29 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +