Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a54d4583 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch... 

am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '9512a857':
  Fix issue #23116383: Include security patch level in Settings
parents d913d78a 9512a857

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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 {

























api/system-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -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 {

























core/java/android/os/Build.java



+11
−0




























Original line number
Diff line number
Diff line








@@ -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.