summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Jang <zachjang@google.com>2015-09-11 16:35:04 -0700
committerThe Android Automerger <android-build@google.com>2015-10-21 12:01:29 -0700
commit5dbe8d9171bae762f98f16172938289d7e295d00 (patch)
treef10e35a1cb50bf41e1df54a00accff0f6e10de63
parentc0a4704f79728a9ae2832b9422a64467b035ee74 (diff)
downloadbase-lollipop-mr1-fi-release.tar.gz
DO NOT MERGE - Backport of ag/748165 to klp-devandroid-5.1.1_r29lollipop-mr1-fi-release
Security patch level in Settings b/23946860 Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
-rw-r--r--core/java/android/os/Build.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 4b0cef6e5a12..a3b2015c3b9b 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -157,6 +157,21 @@ public class Build {
public static final String RELEASE = getString("ro.build.version.release");
/**
+ * The base OS build the product is based on.
+ * For Pre-API 23 - use support libs to access.
+ * @hide
+ */
+ public static final String BASE_OS = SystemProperties.get("ro.build.version.base_os", "");
+
+ /**
+ * The user-visible security patch level.
+ * For Pre-API 23 - use support libs to access.
+ * @hide
+ */
+ 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.
*