diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-13 01:02:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 01:02:26 +0000 |
| commit | a54d4583ec4d6b112a99c29ef71fbabfd67478cb (patch) | |
| tree | eee1344434e0f6453f39fd7d2422fbba90d71138 | |
| parent | d913d78a331de5e488b27810d8dd18399f50de48 (diff) | |
| parent | 9512a857454d761b53f46958733ba23216c41e64 (diff) | |
| download | frameworks_base-a54d4583ec4d6b112a99c29ef71fbabfd67478cb.zip frameworks_base-a54d4583ec4d6b112a99c29ef71fbabfd67478cb.tar.gz frameworks_base-a54d4583ec4d6b112a99c29ef71fbabfd67478cb.tar.bz2 | |
am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit '9512a857454d761b53f46958733ba23216c41e64':
Fix issue #23116383: Include security patch level in Settings
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 11 |
3 files changed, 15 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index cb63aaa..d7fdb2d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22674,12 +22674,14 @@ package android.os { public static class 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 INCREMENTAL; field public static final int PREVIEW_SDK_INT; field public static final java.lang.String RELEASE; field public static final deprecated java.lang.String SDK; field public static final int SDK_INT; + field public static final java.lang.String SECURITY_PATCH; } public static class Build.VERSION_CODES { diff --git a/api/system-current.txt b/api/system-current.txt index 4b062f0..fa08eba 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24618,12 +24618,14 @@ package android.os { public static class 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 INCREMENTAL; field public static final int PREVIEW_SDK_INT; field public static final java.lang.String RELEASE; field public static final deprecated java.lang.String SDK; field public static final int SDK_INT; + field public static final java.lang.String SECURITY_PATCH; } public static class Build.VERSION_CODES { diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index a0162f7..2374899 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -157,6 +157,17 @@ public class Build { 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 * representation; use {@link #SDK_INT} instead. * |