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

Commit fb5e3733 authored by Cole Faust's avatar Cole Faust Committed by Android (Google) Code Review
Browse files

Merge "Baseline NewApi issues" into main

parents a8032190 22cb5128

Android.bp

+1 −22
Original line number Diff line number Diff line
@@ -175,9 +175,6 @@ java_library { 
        // and remove this line.

        "//frameworks/base/tools/hoststubgen:__subpackages__",

    ],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// AIDL files under these paths are mixture of public and private ones.
@@ -270,9 +267,6 @@ java_library { 
    ],

    sdk_version: "core_platform",

    installable: false,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// NOTE: This filegroup is exposed for vendor libraries to depend on and is referenced in
@@ -441,9 +435,6 @@ java_library { 
    ],

    sdk_version: "core_platform",

    installable: false,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// Separated so framework-minus-apex-defaults can be used without the libs dependency
@@ -487,9 +478,6 @@ java_library { 
    ],

    compile_dex: false,

    headers_only: true,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



java_library {
@@ -534,7 +522,7 @@ java_library { 
    },

    lint: {

        enabled: false,

        baseline_filename: "lint-baseline.xml",



    },

}
@@ -559,9 +547,6 @@ java_library { 
    ],

    sdk_version: "core_platform",

    apex_available: ["//apex_available:platform"],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



java_library {
@@ -577,9 +562,6 @@ java_library { 
        "calendar-provider-compat-config",

        "contacts-provider-platform-compat-config",

    ],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



platform_compat_config {
@@ -634,9 +616,6 @@ java_library { 
        "rappor",

    ],

    dxflags: ["--core-library"],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// utility classes statically linked into framework-wifi and dynamically linked

lint-baseline.xml

+6 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="6" by="lint 7.1.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.1.0-dev">

<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">



    <issue

        id="NonUserGetterCalled"
@@ -433,7 +433,7 @@ 
    <issue

        id="NonUserGetterCalled"

        message="`android.provider.Settings.System#getInt()` called from system process. Please call `android.provider.Settings.System#getIntForUser()` instead. "

        errorLine1="        boolean cap = System.getInt(resolver, System.TEXT_AUTO_CAPS, 1) > 0;"

        errorLine1="        boolean cap = System.getInt(resolver, System.TEXT_AUTO_CAPS, 1) &gt; 0;"

        errorLine2="                             ~~~~~~">

        <location

            file="frameworks/base/core/java/android/text/method/TextKeyListener.java"
@@ -444,7 +444,7 @@ 
    <issue

        id="NonUserGetterCalled"

        message="`android.provider.Settings.System#getInt()` called from system process. Please call `android.provider.Settings.System#getIntForUser()` instead. "

        errorLine1="        boolean text = System.getInt(resolver, System.TEXT_AUTO_REPLACE, 1) > 0;"

        errorLine1="        boolean text = System.getInt(resolver, System.TEXT_AUTO_REPLACE, 1) &gt; 0;"

        errorLine2="                              ~~~~~~">

        <location

            file="frameworks/base/core/java/android/text/method/TextKeyListener.java"
@@ -455,7 +455,7 @@ 
    <issue

        id="NonUserGetterCalled"

        message="`android.provider.Settings.System#getInt()` called from system process. Please call `android.provider.Settings.System#getIntForUser()` instead. "

        errorLine1="        boolean period = System.getInt(resolver, System.TEXT_AUTO_PUNCTUATE, 1) > 0;"

        errorLine1="        boolean period = System.getInt(resolver, System.TEXT_AUTO_PUNCTUATE, 1) &gt; 0;"

        errorLine2="                                ~~~~~~">

        <location

            file="frameworks/base/core/java/android/text/method/TextKeyListener.java"
@@ -466,7 +466,7 @@ 
    <issue

        id="NonUserGetterCalled"

        message="`android.provider.Settings.System#getInt()` called from system process. Please call `android.provider.Settings.System#getIntForUser()` instead. "

        errorLine1="        boolean pw = System.getInt(resolver, System.TEXT_SHOW_PASSWORD, 1) > 0;"

        errorLine1="        boolean pw = System.getInt(resolver, System.TEXT_SHOW_PASSWORD, 1) &gt; 0;"

        errorLine2="                            ~~~~~~">

        <location

            file="frameworks/base/core/java/android/text/method/TextKeyListener.java"

packages/SettingsLib/AdaptiveIcon/lint-baseline.xml

+9 −9
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">

<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">



    <issue

        id="NewApi"
@@ -8,7 +8,7 @@ 
        errorLine2="                                 ~~~~~~~~">

        <location

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

            line="78"

            line="79"

            column="34"/>

    </issue>
@@ -19,7 +19,7 @@ 
        errorLine2="                                   ~~~~~~~~">

        <location

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

            line="90"

            line="91"

            column="36"/>

    </issue>
@@ -30,7 +30,7 @@ 
        errorLine2="                                             ~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveOutlineDrawable.java"

            line="43"

            line="45"

            column="46"/>

    </issue>
@@ -41,7 +41,7 @@ 
        errorLine2="        ~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveOutlineDrawable.java"

            line="65"

            line="67"

            column="9"/>

    </issue>
@@ -52,7 +52,7 @@ 
        errorLine2="        ~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveOutlineDrawable.java"

            line="72"

            line="74"

            column="9"/>

    </issue>
@@ -63,7 +63,7 @@ 
        errorLine2="        ~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveOutlineDrawable.java"

            line="80"

            line="82"

            column="9"/>

    </issue>
@@ -74,7 +74,7 @@ 
        errorLine2="                         ~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveOutlineDrawable.java"

            line="105"

            line="107"

            column="26"/>

    </issue>

packages/SettingsLib/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ android_library { 
        "src/**/*.kt",

    ],

    lint: {

        baseline_filename: "lint-baseline.xml",

        extra_check_modules: ["SettingsLibLintChecker"],

    },

}

packages/SettingsLib/EmergencyNumber/lint-baseline.xml

+11 −11
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">

<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">



    <issue

        id="NewApi"
@@ -8,7 +8,7 @@ 
        errorLine2="                                        ~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java"

            line="77"

            line="81"

            column="41"/>

    </issue>
@@ -19,7 +19,7 @@ 
        errorLine2="                                            ~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java"

            line="78"

            line="82"

            column="45"/>

    </issue>
@@ -30,18 +30,18 @@ 
        errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java"

            line="78"

            line="82"

            column="62"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 29 (current min is 21): `android.telephony.TelephonyManager#getEmergencyNumberList`"

        errorLine1="        Map&lt;Integer, List&lt;EmergencyNumber>> allLists = mTelephonyManager.getEmergencyNumberList("

        errorLine1="        Map&lt;Integer, List&lt;EmergencyNumber&gt;&gt; allLists = mTelephonyManager.getEmergencyNumberList("

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

        <location

            file="frameworks/base/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java"

            line="173"

            line="177"

            column="74"/>

    </issue>
@@ -52,7 +52,7 @@ 
        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java"

            line="196"

            line="200"

            column="41"/>

    </issue>
@@ -63,7 +63,7 @@ 
        errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java"

            line="219"

            line="223"

            column="69"/>

    </issue>
@@ -74,7 +74,7 @@ 
        errorLine2="                                        ~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java"

            line="234"

            line="238"

            column="41"/>

    </issue>
@@ -85,7 +85,7 @@ 
        errorLine2="                                                   ~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java"

            line="251"

            line="255"

            column="52"/>

    </issue>