LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change MNC codename to just M.

Browse Source 
Change-Id: If86839c5d1f0bf4f013aa786ba2dc5bcb39527f8
This commit is contained in:
Dianne Hackborn
2015-07-29 15:21:36 -07:00
parent 9146cbdb55
commit 424fb60606
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/browseable/RuntimePermissions/src/com.example.android.system.runtimepermissions/PermissionUtil.java
View File

@@ -79,12 +79,6 @@ public abstract class PermissionUtil {
} }
public static boolean isMNC() { public static boolean isMNC() {
/* return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
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);
} }
} }

8
samples/browseable/RuntimePermissionsBasic/src/com.example.android.basicpermissions/MainActivity.java
View File

@@ -124,12 +124,6 @@ public class MainActivity extends Activity {
} }
public static boolean isMNC() { public static boolean isMNC() {
/* return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
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);
} }
} }