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

Commit ef662c60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add constant for SC V2." am: b4bcc859 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972646

Change-Id: Id28b7282c42ee36986e2ebd3065fd2a40f276733
parents 06e0f144 b4bcc859

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29675,6 +29675,7 @@ package android.os { 
    field public static final int Q = 29; // 0x1d

    field public static final int R = 30; // 0x1e

    field public static final int S = 31; // 0x1f

    field public static final int S_V2 = 32; // 0x20

    field public static final int TIRAMISU = 10000; // 0x2710

  }

























core/java/android/os/Build.java



+9
−1




























Original line number
Diff line number
Diff line








@@ -1037,7 +1037,7 @@ public class Build {













         * will also enable {@link StrictMode.ThreadPolicy.Builder#detectUnbufferedIo}.</li>















         * <li>{@link android.provider.DocumentsContract}'s various methods will throw failure















         * exceptions back to the caller instead of returning null.













         * <li>{@link View#hasFocusable View.hasFocusable} now includes auto-focusable views.</li>













         * <li>{@link View#hasFocusable() View.hasFocusable} now includes auto-focusable views.</li>















         * <li>{@link android.view.SurfaceView} will no longer always change the underlying















         * Surface object when something about it changes; apps need to look at the current















         * state of the object to determine which things they are interested in have changed.</li>










@@ -1144,6 +1144,14 @@ public class Build {













         */















        public static final int S = 31;





























        /**













         * S V2.













         *













         * Once more unto the breach, dear friends, once more.













         *













         */













        public static final int S_V2 = 32;





























        /**















         * Tiramisu.















         */