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

Commit 945c4de8 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Enable strict_updatability_linting for NetworkStack/NetworkStackNext"

parents ae1069b2 d6a4d8ff

Android.bp

+4 −6
Original line number Original line Diff line number Diff line
@@ -245,9 +245,7 @@ android_library { 
        "//packages/modules/NetworkStack/tests/unit",

        "//packages/modules/NetworkStack/tests/unit",

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

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

    ],

    ],

    lint: {

    lint: { strict_updatability_linting: true },

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

    },

}

}





android_library {

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

        "//packages/modules/NetworkStack/tests/unit",

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

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

    ],

    ],

    lint: {

    lint: { strict_updatability_linting: true },

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

    },

}

}





filegroup {

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

        "NetworkPermissionConfig",

        "privapp_whitelist_com.android.networkstack",

        "privapp_whitelist_com.android.networkstack",

    ],

    ],

    lint: { strict_updatability_linting: true },

}

}





// Updatable network stack for finalized API

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

        "privapp_whitelist_com.android.networkstack",

    ],

    ],

    updatable: true,

    updatable: true,

    lint: { strict_updatability_linting: true },

}

}





cc_library_shared {

cc_library_shared {

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

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

package com.android.networkstack.apishim.api29;





import android.net.Uri;

import android.net.Uri;

import android.os.Build;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.RequiresApi;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;





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

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

 * <p>Use {@link com.android.networkstack.apishim.CaptivePortalDataShimImpl} instead of this

 * fallback implementation.

 * fallback implementation.

 */

 */

@RequiresApi(Build.VERSION_CODES.Q)

public abstract class CaptivePortalDataShimImpl implements CaptivePortalDataShim {

public abstract class CaptivePortalDataShimImpl implements CaptivePortalDataShim {

    protected CaptivePortalDataShimImpl() {}

    protected CaptivePortalDataShimImpl() {}

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

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

import android.net.ConnectivityManager.NetworkCallback;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.net.NetworkRequest;

import android.os.Build;

import android.os.Handler;

import android.os.Handler;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.RequiresApi;





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

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

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

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.

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

 */

 */

@RequiresApi(Build.VERSION_CODES.Q)

public class ConnectivityManagerShimImpl implements ConnectivityManagerShim {

public class ConnectivityManagerShimImpl implements ConnectivityManagerShim {

    protected final ConnectivityManager mCm;

    protected final ConnectivityManager mCm;

    protected ConnectivityManagerShimImpl(Context context) {

    protected ConnectivityManagerShimImpl(Context context) {

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

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

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.Uri;

import android.net.Uri;

import android.os.Build;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.annotation.RequiresApi;





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

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

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

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

 * <p>Use {@link com.android.networkstack.apishim.NetworkInformationShimImpl} instead of this

 * fallback implementation.

 * fallback implementation.

 */

 */

@RequiresApi(Build.VERSION_CODES.Q)

public class NetworkInformationShimImpl implements NetworkInformationShim {

public class NetworkInformationShimImpl implements NetworkInformationShim {

    protected NetworkInformationShimImpl() {}

    protected NetworkInformationShimImpl() {}

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

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

package com.android.networkstack.apishim.api29;





import android.net.NetworkRequest;

import android.net.NetworkRequest;

import android.os.Build;

import android.util.Range;

import android.util.Range;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.annotation.RequiresApi;





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

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

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

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

/**

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

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

 */

 */

@RequiresApi(Build.VERSION_CODES.Q)

public class NetworkRequestShimImpl implements NetworkRequestShim {

public class NetworkRequestShimImpl implements NetworkRequestShim {

    protected NetworkRequestShimImpl() {}

    protected NetworkRequestShimImpl() {}