commit 9658b58f3ac03fff77b85a74c1d93ec13983af77
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 16:02:20 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 16:02:20 2022 +0000
tree 99a6f20963d7d89d8fd066d42841932fd0a0f7e9
parent ae644e0b47335749e85e76d09a2e47412de4b007
parent 8d2737e20a56addbf718aba9bc9bdc0c38e8c236

Snap for 8426163 from 8d2737e20a56addbf718aba9bc9bdc0c38e8c236 to mainline-tzdata2-release

Change-Id: I71abfd3315b3ec89cb0cef3d077e4bef958175b9

library/Android.bp

diff --git a/library/Android.bp b/library/Android.bp
index eaccc8e..61cd83a 100644
--- a/library/Android.bp
+++ b/library/Android.bp
@@ -2,29 +2,9 @@
 // Build the platform version of setup wizard library.
 //
 
-package {
-    default_applicable_licenses: ["frameworks_opt_setupwizard_library_license"],
-}
-
-// Added automatically by a large-scale-change
-// http://go/android-license-faq
-license {
-    name: "frameworks_opt_setupwizard_library_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 android_library {
     name: "setup-wizard-lib",
 
-    lint: {
-    	baseline_filename: "lint-baseline-lib.xml",
-    },
     libs: ["androidx.annotation_annotation"],
     manifest: "main/AndroidManifest.xml",
     resource_dirs: [
@@ -46,9 +26,6 @@
 
 android_library {
     name: "setup-wizard-lib-gingerbread-compat",
-    lint: {
-    	baseline_filename: "lint-baseline-gingerbread-lib.xml",
-    },
     manifest: "main/AndroidManifest.xml",
     resource_dirs: [
         "main/res",

library/lint-baseline-gingerbread-lib.xml

diff --git a/library/lint-baseline-gingerbread-lib.xml b/library/lint-baseline-gingerbread-lib.xml
deleted file mode 100644
index 3f25063..0000000
--- a/library/lint-baseline-gingerbread-lib.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
-
-    <issue
-        id="NewApi"
-        message="`&lt;vector>` requires API level 21 (current min is 14) or building with Android Gradle plugin 1.4 or higher"
-        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2=" ~~~~~~">
-        <location
-            file="frameworks/opt/setupwizard/library/gingerbread/res/drawable/suw_ic_expand_less.xml"
-            line="18"
-            column="2"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`&lt;vector>` requires API level 21 (current min is 14) or building with Android Gradle plugin 1.4 or higher"
-        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2=" ~~~~~~">
-        <location
-            file="frameworks/opt/setupwizard/library/gingerbread/res/drawable/suw_ic_expand_more.xml"
-            line="18"
-            column="2"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Attribute `paddingStart` referenced here can result in a crash on some specific devices older than API 17 (current min is 14)"
-        errorLine1="        android:paddingStart=&quot;?attr/listPreferredItemPaddingLeft&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="frameworks/opt/setupwizard/library/gingerbread/res/layout/suw_items_expandable_switch.xml"
-            line="38"
-            column="9"/>
-    </issue>
-
-</issues>

library/lint-baseline-lib.xml

diff --git a/library/lint-baseline-lib.xml b/library/lint-baseline-lib.xml
deleted file mode 100644
index 13e3085..0000000
--- a/library/lint-baseline-lib.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 25 (current min is 23): `android.view.View#setRevealOnFocusHint`"
-        errorLine1="    setRevealOnFocusHint(false);"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="frameworks/opt/setupwizard/library/platform/src/com/android/setupwizardlib/view/RichTextView.java"
-            line="129"
-            column="5"/>
-    </issue>
-
-</issues>