Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Id28b7282c42ee36986e2ebd3065fd2a40f276733
This commit is contained in:
Treehugger Robot
2022-02-05 01:42:53 +00:00
committed by Automerger Merge Worker
parent 06e0f144cb b4bcc85925
commit ef662c60e9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -29675,6 +29675,7 @@ package android.os {
field public static final int Q = 29; // 0x1d field public static final int Q = 29; // 0x1d
field public static final int R = 30; // 0x1e field public static final int R = 30; // 0x1e
field public static final int S = 31; // 0x1f 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 field public static final int TIRAMISU = 10000; // 0x2710
} }

10
core/java/android/os/Build.java
View File

@@ -1037,7 +1037,7 @@ public class Build {
* will also enable {@link StrictMode.ThreadPolicy.Builder#detectUnbufferedIo}.</li> * will also enable {@link StrictMode.ThreadPolicy.Builder#detectUnbufferedIo}.</li>
* <li>{@link android.provider.DocumentsContract}'s various methods will throw failure * <li>{@link android.provider.DocumentsContract}'s various methods will throw failure
* exceptions back to the caller instead of returning null. * 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 * <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 * 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> * 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; 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. * Tiramisu.
*/ */