From c3f7449517743719ace8a8315c6d23d4349db5d1 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 12 Aug 2015 16:10:58 -0700
Subject: [PATCH] Fix issue #23116383: Include security patch level in Settings

Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
---
 api/current.txt                 |  2 ++
 api/system-current.txt          |  2 ++
 core/java/android/os/Build.java | 11 +++++++++++
 3 files changed, 15 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 4b36adcc10e9a..5a92e6570542f 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 36cd869cf1b8f..714eda60d44d1 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 a0162f7f6cef4..23748993f2171 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -156,6 +156,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.