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

Commit ab62e827 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: Ib14056ad67d77243cb72992b4e90457dbdccaa04
Change-Id: I040b8965f32af23b0a71d9b9f7197b5182fcc9b6
parents 2a858092 a960e23f

Android.bp

+4 −14
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



// Whether to enable the targets in this file that target current SDKs.

// Set to false in branches like mainline-prod where API classes are too old to build current code.

enable_current_sdk_targets = true



java_defaults {

    name: "NetworkStackDevApiLevel",

    min_sdk_version: "29",
@@ -57,7 +53,7 @@ java_defaults { 


java_defaults {

    name: "NetworkStackReleaseApiLevel",

    sdk_version: "module_current",

    sdk_version: "module_31",

    min_sdk_version: "29",

    target_sdk_version: "31",

    libs: [
@@ -132,7 +128,6 @@ java_library { 
// integer so if the next SDK release happens to use that integer, we don't need to rename them.

java_library {

    name: "NetworkStackApi31Shims",

    enabled: enable_current_sdk_targets,

    defaults: ["NetworkStackShimsDefaults"],

    srcs: [

        "apishim/31/**/*.java",
@@ -143,7 +138,7 @@ java_library { 
        "NetworkStackApi30Shims",

        "framework-connectivity",

    ],

    sdk_version: "module_current",

    sdk_version: "module_31",

    visibility: ["//visibility:private"],

}
@@ -173,7 +168,6 @@ java_library { 
// called directly by the networkstack code.

java_library {

    name: "NetworkStackApiCurrentShims",

    enabled: enable_current_sdk_targets,

    defaults: ["NetworkStackShimsDefaults"],

    static_libs: [

        "NetworkStackShimsCommon",
@@ -202,7 +196,7 @@ java_library { 
        "NetworkStackApi31Shims",

    ],

    jarjar_rules: "apishim/jarjar-rules-compat.txt",

    sdk_version: "module_current",

    sdk_version: "module_31",

    visibility: [

        "//packages/modules/Connectivity/Tethering",

        "//packages/modules/Connectivity/tests/cts/net",
@@ -244,7 +238,6 @@ android_library { 
    ],

    static_libs: ["NetworkStackApiCurrentShims"],

    manifest: "AndroidManifestBase.xml",

    enabled: enable_current_sdk_targets,

    visibility: [

        "//frameworks/base/tests/net/integration",

        "//packages/modules/Connectivity/Tethering/tests/integration",
@@ -324,7 +317,6 @@ android_app { 
        "PlatformNetworkPermissionConfig",

        "PlatformCaptivePortalLogin",

    ],

    enabled: enable_current_sdk_targets,

}



// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
@@ -332,8 +324,7 @@ android_library { 
    name: "NetworkStackNextManifestBase",

    defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],

    static_libs: ["NetworkStackApiCurrentLib"],

    manifest: "AndroidManifest.xml",

    enabled: enable_current_sdk_targets,

    manifest: "AndroidManifest.xml"

}



// NetworkStack build targeting the current API release, for testing on in-development SDK
@@ -348,7 +339,6 @@ android_app { 
        "NetworkPermissionConfig",

        "privapp_whitelist_com.android.networkstack",

    ],

    enabled: enable_current_sdk_targets,

}



// Updatable network stack for finalized API

apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,13 @@ public class NetworkRequestShimImpl 
        builder.setUids(uids);

    }



    @Override

    public NetworkRequest.Builder setIncludeOtherUidNetworks(NetworkRequest.Builder builder,

            boolean include) {

        builder.setIncludeOtherUidNetworks(include);

        return builder;

    }



    @Override

    public NetworkRequest.Builder newBuilder(@NonNull NetworkRequest request) {

        return new NetworkRequest.Builder(request);

apishim/31/com/android/networkstack/apishim/api31/SettingsShimImpl.java

+1 −3
Original line number Diff line number Diff line
@@ -48,9 +48,7 @@ public class SettingsShimImpl 
    public boolean checkAndNoteWriteSettingsOperation(@NonNull Context context, int uid,

            @NonNull String callingPackage, @Nullable String callingAttributionTag,

            boolean throwException) {

        // Since checkAndNoteWriteSettingsOperation with callingAttributionTag (S method) is not

        // available in AOSP, calling R method (same as API 30 shim) temporary.

        return Settings.checkAndNoteWriteSettingsOperation(context, uid, callingPackage,

                throwException);

                callingAttributionTag, throwException);

    }

}

apishim/common/com/android/networkstack/apishim/common/NetworkRequestShim.java

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ public interface NetworkRequestShim { 
    void setUids(@NonNull NetworkRequest.Builder builder,

            @Nullable Set<Range<Integer>> uids) throws UnsupportedApiLevelException;



    /**

     * See android.net.NetworkRequest.Builder#setIncludeOtherUidNetworks.

     */

    default NetworkRequest.Builder setIncludeOtherUidNetworks(NetworkRequest.Builder builder,

            boolean include) throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Not supported before API 31.");

    }



    /**

     * See android.net.NetworkRequest.Builder(NetworkRequest).

     * @throws UnsupportedApiLevelException if API is not available in the API level.

lint-baseline-current-lib.xml

+0 −165
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 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"

        errorLine1="                        ConnectivityUtils.addressAndPortToString("

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

        <location

            file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"

            line="1032"

            column="43"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"

        errorLine1="                        ConnectivityUtils.addressAndPortToString("

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

        <location

            file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"

            line="1034"

            column="43"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"

        errorLine1="                        ConnectivityUtils.addressAndPortToString("

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

        <location

            file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"

            line="1087"

            column="43"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"

        errorLine1="                        ConnectivityUtils.addressAndPortToString("

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

        <location

            file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"

            line="1089"

            column="43"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#any`"

        errorLine1="        final boolean haveKeepaliveResponses = CollectionUtils.any(mKeepalivePackets,"

        errorLine2="                                                               ~~~">

        <location

            file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"

            line="1368"

            column="64"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#toIntArray`"

        errorLine1="                    CollectionUtils.toIntArray(mDnsReturnCode),"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/DataStallDetectionStats.java"

            line="302"

            column="37"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#toLongArray`"

        errorLine1="                    CollectionUtils.toLongArray(mDnsTimeStamp),"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/DataStallDetectionStats.java"

            line="303"

            column="37"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
@@ -100,50 +23,6 @@ 
            column="15"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"

        errorLine1="            mStatsBuilder.setIpv4LatencyMicros(ConnectivityUtils.saturatedCast(mIpv4Watch.stop()));"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/IpProvisioningMetrics.java"

            line="74"

            column="66"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"

        errorLine1="            mStatsBuilder.setIpv6LatencyMicros(ConnectivityUtils.saturatedCast(mIpv6Watch.stop()));"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/IpProvisioningMetrics.java"

            line="83"

            column="66"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#isEmpty`"

        errorLine1="        if (isEmpty(mCaptivePortalFallbackSpecs)) {"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"

            line="2279"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#isIPv6ULA`"

        errorLine1="                    || isIPv6ULA(address)) {"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"

            line="2447"

            column="24"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.telephony.NetworkRegistrationInfo#getCellIdentity`"
@@ -155,48 +34,4 @@ 
            column="46"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"

        errorLine1="        int latencyUs = ConnectivityUtils.saturatedCast(durationUs);"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"

            line="198"

            column="43"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"

        errorLine1="                .setRemainingTtlSecs(ConnectivityUtils.saturatedCast(secondsRemaining))"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"

            line="209"

            column="56"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"

        errorLine1="                        ConnectivityUtils.saturatedCast(capportData.getByteLimit() / 1000))"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"

            line="212"

            column="43"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"

        errorLine1="        mStatsBuilder.setLatencyMicros(ConnectivityUtils.saturatedCast(mWatch.stop()));"

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

        <location

            file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"

            line="237"

            column="58"/>

    </issue>



</issues>