Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24a2a966 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15601928, 15601978, 15601929, 15602376, 15602372,... 

Merge cherrypicks of [15601928, 15601978, 15601929, 15602376, 15602372, 15601960, 15601961, 15601962, 15601963, 15601964, 15602416, 15602437, 15602438, 15602440, 15602441, 15602443, 15602444, 15602445, 15602446, 15602447, 15601006, 15601007, 15601008, 15601009, 15601010, 15601011, 15601932, 15601933, 15601934, 15601935, 15602456, 15602457, 15602458, 15602459, 15601981, 15601982, 15601983, 15601984, 15602417, 15602418, 15602419, 15602420, 15602421, 15602422, 15602423, 15602379, 15602380, 15602381, 15602382, 15602383, 15602384, 15602385, 15602386, 15601012, 15601013, 15601014, 15601015, 15602476, 15602477] into sc-release

Change-Id: I98d27d05acafe24ad2fe37a9f092f6907e8ed3c7
parents fee0bc79 421a14f3

core/java/android/hardware/face/FaceManager.java

+5 −0
Original line number Diff line number Diff line
@@ -790,6 +790,11 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
                }

            }

        }



        // This is used as a last resort in case a vendor string is missing

        // It should not happen for anything other than FACE_ERROR_VENDOR, but

        // warn and use the default if all else fails.

        // TODO(b/196639965): update string

        Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode);

        return "";

    }

core/java/android/hardware/fingerprint/FingerprintManager.java

+6 −1
Original line number Diff line number Diff line
@@ -1386,8 +1386,13 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
                }

            }

        }



        // This is used as a last resort in case a vendor string is missing

        // It should not happen for anything other than FINGERPRINT_ERROR_VENDOR, but

        // warn and use the default if all else fails.

        // TODO(b/196639965): update string

        Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode);

        return null;

        return "";

    }



    /**

packages/SettingsLib/ActionBarShadow/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ android_library { 
    ],



    sdk_version: "system_current",

    min_sdk_version: "21",

    min_sdk_version: "28",

}

packages/SettingsLib/ActionBarShadow/lint-baseline.xml

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
<?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 23 (current min is 21): `android.view.View#setOnScrollChangeListener`"

        errorLine1="            mScrollView.setOnScrollChangeListener(mScrollChangeWatcher);"

        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java"

            line="81"

            column="25"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 23 (current min is 21): `android.view.View#setOnScrollChangeListener`"

        errorLine1="        mScrollView.setOnScrollChangeListener(null);"

        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java"

            line="88"

            column="21"/>

    </issue>



    <issue

        id="NewApi"

        message="Class requires API level 23 (current min is 21): `android.view.View.OnScrollChangeListener`"

        errorLine1="    final class ScrollChangeWatcher implements View.OnScrollChangeListener {"

        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java"

            line="95"

            column="48"/>

    </issue>



</issues>

packages/SettingsLib/ActionButtonsPreference/lint-baseline.xml

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
<?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="`android:Widget.DeviceDefault.Button.Borderless.Colored` requires API level 28 (current min is 21)"

        errorLine1="    &lt;style name=&quot;SettingsActionButton&quot; parent=&quot;android:Widget.DeviceDefault.Button.Borderless.Colored&quot;>"

        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/values/styles.xml"

            line="19"

            column="40"/>

    </issue>



    <issue

        id="NewApi"

        message="`android:drawableTint` requires API level 23 (current min is 21)"

        errorLine1="        &lt;item name=&quot;android:drawableTint&quot;>@*android:color/btn_colored_borderless_text_material&lt;/item>"

        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/values/styles.xml"

            line="21"

            column="15"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:topLeftRadius=&quot;?android:attr/dialogCornerRadius&quot;"

        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml"

            line="23"

            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:bottomLeftRadius=&quot;?android:attr/dialogCornerRadius&quot;"

        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml"

            line="25"

            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:topRightRadius=&quot;?android:attr/dialogCornerRadius&quot;"

        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml"

            line="24"

            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:bottomRightRadius=&quot;?android:attr/dialogCornerRadius&quot;"

        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml"

            line="26"

            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:bottomRightRadius=&quot;?android:attr/dialogCornerRadius&quot;"

        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml"

            line="23"

            column="9"/>

    </issue>



</issues>