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

Commit 1af7c1b3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7890950 from b44c73ba to mainline-media-swcodec-release 

Change-Id: Ib9ce9aa18d08fdd11b90f359e86877273b6a670d
parents 1e77c97d b44c73ba

Android.bp

+5 −7
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ java_defaults { 
    name: "NetworkStackShimsDefaults",

    libs: [

        "androidx.annotation_annotation",

        "networkstack-client",

        "networkstack-aidl-latest",

    ],

    static_libs : [

        "modules-utils-build_system"
@@ -245,9 +245,7 @@ android_library { 
        "//packages/modules/NetworkStack/tests/unit",

        "//packages/modules/NetworkStack/tests/integration",

    ],

    lint: {

        baseline_filename: "lint-baseline-current-lib.xml",

    },

    lint: { strict_updatability_linting: true },

}



android_library {
@@ -268,9 +266,7 @@ android_library { 
        "//packages/modules/NetworkStack/tests/unit",

        "//packages/modules/NetworkStack/tests/integration",

    ],

    lint: {

        baseline_filename: "lint-baseline-stable-lib.xml",

    },

    lint: { strict_updatability_linting: true },

}



filegroup {
@@ -339,6 +335,7 @@ android_app { 
        "NetworkPermissionConfig",

        "privapp_whitelist_com.android.networkstack",

    ],

    lint: { strict_updatability_linting: true },

}



// Updatable network stack for finalized API
@@ -354,6 +351,7 @@ android_app { 
        "privapp_whitelist_com.android.networkstack",

    ],

    updatable: true,

    lint: { strict_updatability_linting: true },

}



cc_library_shared {

apishim/29/com/android/networkstack/apishim/api29/CaptivePortalDataShimImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package com.android.networkstack.apishim.api29;



import android.net.Uri;

import android.os.Build;



import androidx.annotation.NonNull;

import androidx.annotation.RequiresApi;

import androidx.annotation.VisibleForTesting;



import com.android.networkstack.apishim.common.CaptivePortalDataShim;
@@ -33,6 +35,7 @@ import org.json.JSONObject; 
 * <p>Use {@link com.android.networkstack.apishim.CaptivePortalDataShimImpl} instead of this

 * fallback implementation.

 */

@RequiresApi(Build.VERSION_CODES.Q)

public abstract class CaptivePortalDataShimImpl implements CaptivePortalDataShim {

    protected CaptivePortalDataShimImpl() {}

apishim/29/com/android/networkstack/apishim/api29/ConnectivityManagerShimImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -25,9 +25,11 @@ import android.net.ConnectivityManager; 
import android.net.ConnectivityManager.NetworkCallback;

import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.os.Build;

import android.os.Handler;



import androidx.annotation.NonNull;

import androidx.annotation.RequiresApi;



import com.android.networkstack.apishim.common.ConnectivityManagerShim;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
@@ -35,6 +37,7 @@ import com.android.networkstack.apishim.common.UnsupportedApiLevelException; 
/**

 * Implementation of {@link ConnectivityManagerShim} for API 29.

 */

@RequiresApi(Build.VERSION_CODES.Q)

public class ConnectivityManagerShimImpl implements ConnectivityManagerShim {

    protected final ConnectivityManager mCm;

    protected ConnectivityManagerShimImpl(Context context) {

apishim/29/com/android/networkstack/apishim/api29/NetworkInformationShimImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ import android.net.IpPrefix; 
import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.Uri;

import android.os.Build;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.RequiresApi;



import com.android.networkstack.apishim.common.CaptivePortalDataShim;

import com.android.networkstack.apishim.common.NetworkInformationShim;
@@ -35,6 +37,7 @@ import java.net.Inet4Address; 
 * <p>Use {@link com.android.networkstack.apishim.NetworkInformationShimImpl} instead of this

 * fallback implementation.

 */

@RequiresApi(Build.VERSION_CODES.Q)

public class NetworkInformationShimImpl implements NetworkInformationShim {

    protected NetworkInformationShimImpl() {}

apishim/29/com/android/networkstack/apishim/api29/NetworkRequestShimImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 
package com.android.networkstack.apishim.api29;



import android.net.NetworkRequest;

import android.os.Build;

import android.util.Range;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.RequiresApi;



import com.android.networkstack.apishim.common.NetworkRequestShim;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
@@ -30,6 +32,7 @@ import java.util.Set; 
/**

 * Implementation of {@link NetworkRequestShim} for API 29.

 */

@RequiresApi(Build.VERSION_CODES.Q)

public class NetworkRequestShimImpl implements NetworkRequestShim {

    protected NetworkRequestShimImpl() {}