From 9b8062eee39627e98c20e2c78d66d334bd419e4f Mon Sep 17 00:00:00 2001
From: Jackal Guo <jackalguo@google.com>
Date: Mon, 13 Sep 2021 18:48:08 +0800
Subject: [PATCH] Deprecate android:isSplitRequired

Since android:requiredSplitTypes and android:splitTypes are introduced
android:isSplitRequired is been a bit too ambiguous to be very useful
to this point. requiredSplitTypes provides a more specific form of
isSplitRequired by defining exactly what is required and when provided
as anything other than empty string implies isSplitRequired="true".

Bug: 198708193
Test: build
Change-Id: Ic3803794df80fdbfc12c07ae84f3d46e2cf74db6
---
 core/api/current.txt                   | 2 +-
 core/res/res/values/attrs_manifest.xml | 3 ++-
 core/res/res/values/public.xml         | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 78c4cdfda40ca..c593ccb6d3426 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -842,7 +842,7 @@ package android {
     field @Deprecated public static final int isModifier = 16843334; // 0x1010246
     field @Deprecated public static final int isRepeatable = 16843336; // 0x1010248
     field public static final int isScrollContainer = 16843342; // 0x101024e
-    field public static final int isSplitRequired = 16844177; // 0x1010591
+    field @Deprecated public static final int isSplitRequired = 16844177; // 0x1010591
     field public static final int isStatic = 16844122; // 0x101055a
     field @Deprecated public static final int isSticky = 16843335; // 0x1010247
     field public static final int isolatedProcess = 16843689; // 0x10103a9
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index fc9b55ffb6453..755938eefdbd8 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1221,7 +1221,8 @@
     <attr name="isFeatureSplit" format="boolean" />
 
     <!-- Flag to specify if this APK requires at least one split [either feature or
-         resource] to be present in order to function. Default value is false. -->
+         resource] to be present in order to function. Default value is false.
+         @deprecated Use {@link android.R.attr#requiredSplitTypes} instead. -->
     <attr name="isSplitRequired" format="boolean" />
 
     <!-- List of split types required by this APK to be present in order to function properly,
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index e28288d357d87..d1c694022a1a8 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2905,6 +2905,7 @@
     <public type="attr" name="usesNonSdkApi" id="0x0101058e" />
     <public type="attr" name="nonInteractiveUiTimeout" id="0x0101058f" />
     <public type="attr" name="isLightTheme" id="0x01010590" />
+    <!-- {@deprecated Use requiredSplitTypes instead.} -->
     <public type="attr" name="isSplitRequired" id="0x01010591" />
     <public type="attr" name="textLocale" id="0x01010592" />
     <public type="attr" name="settingsSliceUri" id="0x01010593" />