summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-07-31 19:42:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-31 19:42:15 +0000
commit65485d4097b704f4df6a5dcd180873be55d51645 (patch)
tree6c6f450dc669b88cbd511fce3137120531393cae
parent6269e66df53113c46918e8f8a46b711e50a9899a (diff)
parentef0b96ce4571805066c1e0865d41272b066e22e6 (diff)
downloadandroid_packages_apps_Camera2-65485d4097b704f4df6a5dcd180873be55d51645.tar.gz
android_packages_apps_Camera2-65485d4097b704f4df6a5dcd180873be55d51645.tar.bz2
android_packages_apps_Camera2-65485d4097b704f4df6a5dcd180873be55d51645.zip
am ef0b96ce: Change MNC codename to just M.
* commit 'ef0b96ce4571805066c1e0865d41272b066e22e6': Change MNC codename to just M.
-rw-r--r--src/com/android/camera/util/ApiHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java
index 1b97553a2..471ee0599 100644
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
@@ -114,7 +114,7 @@ public class ApiHelper {
}
public static boolean isMOrHigher() {
- return Build.VERSION.SDK_INT >= Build.VERSION_CODES.MNC
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
|| "MNC".equals(Build.VERSION.CODENAME);
}
}