summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Jang <zachjang@google.com>2015-09-21 19:10:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-21 19:10:46 +0000
commitb5173241d160a5b6f4d440a01c9a9b0281ee4e66 (patch)
treec268f4675aa860868c2df33a1d6834919614d143
parentf68b1953259a13562f5a2331526edafae5c1d99f (diff)
parente54c195a53694696e0913722fa721c882e33753e (diff)
downloadframeworks_base-b5173241d160a5b6f4d440a01c9a9b0281ee4e66.zip
frameworks_base-b5173241d160a5b6f4d440a01c9a9b0281ee4e66.tar.gz
frameworks_base-b5173241d160a5b6f4d440a01c9a9b0281ee4e66.tar.bz2
am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit 'e54c195a53694696e0913722fa721c882e33753e': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
-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 4b0cef6..a3b2015 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.
*