Put in real "code" (aka marketing) name.

Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe

3 files changed, 12 insertions, 8 deletions

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 5f95b04..ee36012 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -485,7 +485,7 @@ public class Build {
         public static final int JELLY_BEAN = 16;
 
         /**
-         * Android 4.2: Moar jelly beans!
+         * November 2012: Android 4.2, Moar jelly beans!
          *
          * <p>Applications targeting this or a later release will get these
          * new changes in behavior:</p>
@@ -505,12 +505,12 @@ public class Build {
         public static final int JELLY_BEAN_MR1 = 17;
 
         /**
-         * Android 4.3: Jelly Bean MR2, the revenge of the beans.
+         * July 2013: Android 4.3, the revenge of the beans.
          */
         public static final int JELLY_BEAN_MR2 = 18;
 
         /**
-         * Android 4.4: KitKat, another tasty treat.
+         * October 2013: Android 4.4, KitKat, another tasty treat.
          *
          * <p>Applications targeting this or a later release will get these
          * new changes in behavior:</p>
@@ -553,7 +553,12 @@ public class Build {
         public static final int KITKAT_WATCH = 20;
 
         /**
-         * L!
+         * Temporary until we completely switch to {@link #LOLLIPOP}.
+         */
+        public static final int L = 21;
+
+        /**
+         * Lollipop.  A flat one with beautiful shadows.  But still tasty.
          *
          * <p>Applications targeting this or a later release will get these
          * new changes in behavior:</p>
@@ -563,7 +568,7 @@ public class Build {
          * Intent.</li>
          * </ul>
          */
-        public static final int L = 21;
+        public static final int LOLLIPOP = 21;
     }
     
     /** The type of build, like "user" or "eng". */
diff --git a/core/java/android/os/Message.java b/core/java/android/os/Message.java
index b6b70cc..6a0bddc 100644
--- a/core/java/android/os/Message.java
+++ b/core/java/android/os/Message.java
@@ -260,7 +260,7 @@ public final class Message implements Parcelable {
 
     /** @hide */
     public static void updateCheckRecycle(int targetSdkVersion) {
-        if (targetSdkVersion < Build.VERSION_CODES.L) {
+        if (targetSdkVersion < Build.VERSION_CODES.LOLLIPOP) {
             gCheckRecycle = false;
         }
     }
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 37294e7..9a0b222 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -19,7 +19,6 @@ import android.annotation.SystemApi;
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -434,7 +433,7 @@ public class UserManager {
      * Used to determine whether the user making this call is subject to
      * teleportations.
      *
-     * <p>As of {@link android.os.Build.VERSION_CODES#L}, this method can
+     * <p>As of {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method can
      * now automatically identify goats using advanced goat recognition technology.</p>
      *
      * @return Returns true if the user making this call is a goat.