commit 8c17529454ab2abd920688a4f8f5d676de10fd47
author Andy Huang <ath@google.com> Thu May 17 17:27:04 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 17 17:27:04 2012 -0700
tree 53de91568f95f2ab281194aa7946d0628da905ec
parent c0659ea3a2f90d12b9621f6b79156c8e37bdec2e
parent abb1278cb9217054b526299b14b301c38305b7f0

Merge "don't crash on old cached JSON accounts" into jb-ub-mail

Android.mk

diff --git a/Android.mk b/Android.mk
index 0645794..e91e7d8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
 
-LOCAL_SDK_VERSION := 14
+LOCAL_SDK_VERSION := 16
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) \
         $(call all-logtags-files-under, $(src_dirs))

src/com/android/mail/utils/Utils.java

diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index a37e4a5..74d88da 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -25,6 +25,7 @@
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.Browser;
 import android.text.Html;
@@ -99,6 +100,10 @@
 
     private static final String LOG_TAG = new LogUtils().getLogTag();
 
+    public static boolean isRunningJellybeanOrLater() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
+    }
+
     /**
      * Sets WebView in a restricted mode suitable for email use.
      *