diff options
| author | 2022-02-05 01:42:53 +0000 | |
|---|---|---|
| committer | 2022-02-05 01:42:53 +0000 | |
| commit | ef662c60e9f13252a773092fd6ce99a2c2b54236 (patch) | |
| tree | 9d4fc5afd1666d73a8ce754b510280d442f96830 | |
| parent | 06e0f144cb4e1bfbdff472e726cdb7de35a73deb (diff) | |
| parent | b4bcc8592581b412a9b67493ca2570f9e93389c0 (diff) | |
Merge "Add constant for SC V2." am: b4bcc85925
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972646
Change-Id: Id28b7282c42ee36986e2ebd3065fd2a40f276733
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 6a72017c9610..d6a79159e13e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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 } diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 6863a0b76b03..f46f45228f07 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -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> @@ -1145,6 +1145,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. */ public static final int TIRAMISU = CUR_DEVELOPMENT; |