summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2014-10-03 12:20:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-03 12:20:24 +0000
commitebb2a66b79b2761ed29f2f8a3140217c126e448b (patch)
tree8eb174fff426cb5d1f0d0673ece4f60b92a2b5e3
parentadf571c7725f0281a3e37a4b6254818da956ca53 (diff)
parent0cd271918a7c7baa69e872f7128351a0c7dbbbae (diff)
downloadandroid_packages_apps_Trebuchet-ebb2a66b79b2761ed29f2f8a3140217c126e448b.tar.gz
android_packages_apps_Trebuchet-ebb2a66b79b2761ed29f2f8a3140217c126e448b.tar.bz2
android_packages_apps_Trebuchet-ebb2a66b79b2761ed29f2f8a3140217c126e448b.zip
am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
* commit '0cd271918a7c7baa69e872f7128351a0c7dbbbae': Remove reference to CODENAME from compat code.
-rw-r--r--src/com/android/launcher3/compat/UserHandleCompat.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/compat/UserHandleCompat.java b/src/com/android/launcher3/compat/UserHandleCompat.java
index 4baf05247..2ae673171 100644
--- a/src/com/android/launcher3/compat/UserHandleCompat.java
+++ b/src/com/android/launcher3/compat/UserHandleCompat.java
@@ -20,6 +20,8 @@ import android.content.Intent;
import android.os.Build;
import android.os.UserHandle;
+import com.android.launcher3.Utilities;
+
public class UserHandleCompat {
private UserHandle mUser;
@@ -86,9 +88,8 @@ public class UserHandleCompat {
* profiles so this is a no-op.
*/
public void addToIntent(Intent intent, String name) {
- // TODO change this to use api version once L gets an API number.
- if ("L".equals(Build.VERSION.CODENAME) && mUser != null) {
+ if (Utilities.isLmpOrAbove() && mUser != null) {
intent.putExtra(name, mUser);
}
}
-} \ No newline at end of file
+}