summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-08-01 16:55:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-01 16:55:49 +0000
commitba6e96ae636ba23188c8cd4210a7b55a9ab6a58d (patch)
tree051420753a0f12cc1c93394d3e0f36c73599cbff
parent8d9b317a49cc4a1be18116511062e075430c6c58 (diff)
parent60c84e082c06df890c2f6af710dde4f83b407ee1 (diff)
downloadandroid_packages_apps_Camera2-ba6e96ae636ba23188c8cd4210a7b55a9ab6a58d.tar.gz
android_packages_apps_Camera2-ba6e96ae636ba23188c8cd4210a7b55a9ab6a58d.tar.bz2
android_packages_apps_Camera2-ba6e96ae636ba23188c8cd4210a7b55a9ab6a58d.zip
am 60c84e08: am 65485d40: am ef0b96ce: Change MNC codename to just M.
* commit '60c84e082c06df890c2f6af710dde4f83b407ee1': 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);
}
}