Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

Browse Source 
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
  Fix issue #23116383: Include security patch level in Settings
This commit is contained in:
Dianne Hackborn
2015-08-13 00:54:35 +00:00
committed by Android Git Automerger
parent ea68c4ceac ff9912d594
commit 9512a85745
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -22674,12 +22674,14 @@ package android.os {
public static class Build.VERSION { public static class Build.VERSION {
ctor public Build.VERSION(); ctor public Build.VERSION();
field public static final java.lang.String BASE_OS;
field public static final java.lang.String CODENAME; field public static final java.lang.String CODENAME;
field public static final java.lang.String INCREMENTAL; field public static final java.lang.String INCREMENTAL;
field public static final int PREVIEW_SDK_INT; field public static final int PREVIEW_SDK_INT;
field public static final java.lang.String RELEASE; field public static final java.lang.String RELEASE;
field public static final deprecated java.lang.String SDK; field public static final deprecated java.lang.String SDK;
field public static final int SDK_INT; field public static final int SDK_INT;
field public static final java.lang.String SECURITY_PATCH;
} }
public static class Build.VERSION_CODES { public static class Build.VERSION_CODES {

2
api/system-current.txt
View File

@@ -24618,12 +24618,14 @@ package android.os {
public static class Build.VERSION { public static class Build.VERSION {
ctor public Build.VERSION(); ctor public Build.VERSION();
field public static final java.lang.String BASE_OS;
field public static final java.lang.String CODENAME; field public static final java.lang.String CODENAME;
field public static final java.lang.String INCREMENTAL; field public static final java.lang.String INCREMENTAL;
field public static final int PREVIEW_SDK_INT; field public static final int PREVIEW_SDK_INT;
field public static final java.lang.String RELEASE; field public static final java.lang.String RELEASE;
field public static final deprecated java.lang.String SDK; field public static final deprecated java.lang.String SDK;
field public static final int SDK_INT; field public static final int SDK_INT;
field public static final java.lang.String SECURITY_PATCH;
} }
public static class Build.VERSION_CODES { public static class Build.VERSION_CODES {

11
core/java/android/os/Build.java
View File

@@ -156,6 +156,17 @@ public class Build {
*/ */
public static final String RELEASE = getString("ro.build.version.release"); public static final String RELEASE = getString("ro.build.version.release");
/**
* The base OS build the product is based on.
*/
public static final String BASE_OS = SystemProperties.get("ro.build.version.base_os", "");
/**
* The user-visible security patch level.
*/
public static final String SECURITY_PATCH = SystemProperties.get(
"ro.build.version.security_patch", "");
/** /**
* The user-visible SDK version of the framework in its raw String * The user-visible SDK version of the framework in its raw String
* representation; use {@link #SDK_INT} instead. * representation; use {@link #SDK_INT} instead.