summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-08-13 00:46:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-13 00:46:59 +0000
commitff9912d594bc5cdc10a4a224b9a2296bac50851b (patch)
tree6d571e14739a8991491c26ecf209649bf2ed08b1
parentc97509c0292910d7fb27e4c890ad4bc0ea723fec (diff)
parentc3f7449517743719ace8a8315c6d23d4349db5d1 (diff)
downloadframeworks_base-ff9912d594bc5cdc10a4a224b9a2296bac50851b.zip
frameworks_base-ff9912d594bc5cdc10a4a224b9a2296bac50851b.tar.gz
frameworks_base-ff9912d594bc5cdc10a4a224b9a2296bac50851b.tar.bz2
Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--core/java/android/os/Build.java11
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 a9bc944..3c88e59 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.
*