summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-12-16 22:00:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-16 22:00:16 +0000
commit90a40570bc54506979d3610ee331deacfa7300ec (patch)
tree7acebff93b35083cd114f15fe6caf6d216740bb9 /src/com
parentaecb7cf97c822fd1fd3df2a366618f9d7a2ba579 (diff)
parent88e5aa1d616f0d05fb8f9e2ca8000dcfb3824c67 (diff)
downloadandroid_packages_apps_Trebuchet-90a40570bc54506979d3610ee331deacfa7300ec.tar.gz
android_packages_apps_Trebuchet-90a40570bc54506979d3610ee331deacfa7300ec.tar.bz2
android_packages_apps_Trebuchet-90a40570bc54506979d3610ee331deacfa7300ec.zip
Merge "Using support lib for isAtleastO check" into ub-launcher3-master
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/Utilities.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 3e44e33be..6485fc137 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -41,6 +41,7 @@ import android.os.Bundle;
import android.os.DeadObjectException;
import android.os.PowerManager;
import android.os.TransactionTooLargeException;
+import android.support.v4.os.BuildCompat;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
@@ -89,9 +90,7 @@ public final class Utilities {
private static final Matrix sInverseMatrix = new Matrix();
public static boolean isAtLeastO() {
- // TODO: Clean this up: b/32610406
- return !"REL".equals(Build.VERSION.CODENAME)
- && "O".compareTo(Build.VERSION.CODENAME) <= 0;
+ return BuildCompat.isAtLeastO();
}
public static final boolean ATLEAST_NOUGAT_MR1 =