commit f38a2eb1648dffc44ada50d4344f37679ae55b34
author Adam Cohen <adamcohen@google.com> Sat Oct 18 16:08:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 18 16:08:14 2014 +0000
tree 18781a7d0302d74eada66e493388a33d70e8075b
parent d54cf54387d8c434fefd18ce7a6bdbf3ea586b39
parent 91c11b28d57c026d507488c58feedebf7fee6f31

am 91c11b28: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop

* commit '91c11b28d57c026d507488c58feedebf7fee6f31':
  Don't let old Launcher activity interfere with new one

src/com/android/launcher3/Utilities.java

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 80d4b22..1a7c9fc 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -106,7 +106,7 @@
      * Indicates if the device is running LMP or higher.
      */
     public static boolean isLmpOrAbove() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.L;
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
     }
 
     /**

src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java

diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
index c3853ab..03d43a6 100644
--- a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
+++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
@@ -43,7 +43,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.L)
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 class AppWidgetManagerCompatVL extends AppWidgetManagerCompat {
 
     private final UserManager mUserManager;