diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-29 15:21:36 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-07-29 15:21:36 -0700 |
| commit | 424fb60606196329311b7400b587fafd506cf907 (patch) | |
| tree | 655b7de476aa9c83dbfd8f8b7a9593b0409c7f31 /samples | |
| parent | 9146cbdb556a814628176f599f7cd9bde28b75d9 (diff) | |
| download | android_development-424fb60606196329311b7400b587fafd506cf907.tar.gz android_development-424fb60606196329311b7400b587fafd506cf907.tar.bz2 android_development-424fb60606196329311b7400b587fafd506cf907.zip | |
Change MNC codename to just M.
Change-Id: If86839c5d1f0bf4f013aa786ba2dc5bcb39527f8
Diffstat (limited to 'samples')
2 files changed, 2 insertions, 14 deletions
diff --git a/samples/browseable/RuntimePermissions/src/com.example.android.system.runtimepermissions/PermissionUtil.java b/samples/browseable/RuntimePermissions/src/com.example.android.system.runtimepermissions/PermissionUtil.java index ba2370fda..d0742ead9 100644 --- a/samples/browseable/RuntimePermissions/src/com.example.android.system.runtimepermissions/PermissionUtil.java +++ b/samples/browseable/RuntimePermissions/src/com.example.android.system.runtimepermissions/PermissionUtil.java @@ -79,12 +79,6 @@ public abstract class PermissionUtil { } public static boolean isMNC() { - /* - TODO: In the Android M Preview release, checking if the platform is M is done through - the codename, not the version code. Once the API has been finalised, the following check - should be used: */ - // return Build.VERSION.SDK_INT == Build.VERSION_CODES.MNC - - return "MNC".equals(Build.VERSION.CODENAME); + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; } } diff --git a/samples/browseable/RuntimePermissionsBasic/src/com.example.android.basicpermissions/MainActivity.java b/samples/browseable/RuntimePermissionsBasic/src/com.example.android.basicpermissions/MainActivity.java index 9de3b0181..36941ebb9 100644 --- a/samples/browseable/RuntimePermissionsBasic/src/com.example.android.basicpermissions/MainActivity.java +++ b/samples/browseable/RuntimePermissionsBasic/src/com.example.android.basicpermissions/MainActivity.java @@ -124,12 +124,6 @@ public class MainActivity extends Activity { } public static boolean isMNC() { - /* - TODO: In the Android M Preview release, checking if the platform is M is done through - the codename, not the version code. Once the API has been finalised, the following check - should be used: */ - // return Build.VERSION.SDK_INT >= Build.VERSION_CODES.MNC - - return "MNC".equals(Build.VERSION.CODENAME); + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; } } |