From dec589fbce7be33a25d0a3d8f89ef1902e68d3cd Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Wed, 27 Oct 2021 12:24:23 +0100
Subject: Add constant for SC V2.

Bug: 204295952
Test: N/A
Merged-In: Ieecebfccf9366815c93d620b70aeabc1abcd3ebd
Change-Id: Ieecebfccf9366815c93d620b70aeabc1abcd3ebd
---
 core/api/current.txt            |  1 +
 core/java/android/os/Build.java | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index e015169cf69a..a1addc409cb3 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -30857,6 +30857,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
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 6bf394dc347b..b7dd36e2c4f5 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1024,7 +1024,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>
@@ -1130,6 +1130,15 @@ public class Build {
          * S.
          */
         public static final int S = 31;
+
+        /**
+         * S V2.
+         *
+         * Once more unto the breach, dear friends, once more.
+         *
+         */
+        public static final int S_V2 = 32;
+
     }
 
     /** The type of build, like "user" or "eng". */
-- 
cgit v1.2.3-59-g8ed1b