summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-08-01 16:35:58 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-01 16:35:58 (GMT)
commit60c84e082c06df890c2f6af710dde4f83b407ee1 (patch)
treeb11c75c2b5e4f1c18bca093fb07458aaa96114d0
parent71e31e6b1ac3b5cb02497e967ffffc2120544432 (diff)
parent65485d4097b704f4df6a5dcd180873be55d51645 (diff)
downloadandroid_packages_apps_Camera2-60c84e082c06df890c2f6af710dde4f83b407ee1.zip
android_packages_apps_Camera2-60c84e082c06df890c2f6af710dde4f83b407ee1.tar.gz
android_packages_apps_Camera2-60c84e082c06df890c2f6af710dde4f83b407ee1.tar.bz2
am 65485d40: am ef0b96ce: Change MNC codename to just M.
* commit '65485d4097b704f4df6a5dcd180873be55d51645': 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 1b97553..471ee05 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);
}
}