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

Commit 01d53419 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6507440 from 38dc8345 to rvc-release 

Change-Id: I0d2b496190ed398e23e2f911e2dae1e7a291f93f
parents 62b4258c 38dc8345

Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ java_defaults { 


java_defaults {

    name: "NetworkStackReleaseApiLevel",

    sdk_version: "system_29",

    sdk_version: "system_30",

    min_sdk_version: "29",

    target_sdk_version: "29",

    target_sdk_version: "30",

}



// Filegroups for the API shims
@@ -60,6 +60,7 @@ filegroup { 
        "apishim/common/**/*.java",

        "apishim/29/**/*.java",

        "apishim/30/**/*.java",

        "apishim/31/**/*.java",

        ":networkstack-module-utils-srcs",

    ],

}
@@ -71,6 +72,7 @@ filegroup { 
    srcs: [

        "apishim/common/**/*.java",

        "apishim/29/**/*.java",

        "apishim/30/**/*.java",

        ":networkstack-module-utils-srcs",

    ],

}

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

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.networkstack.apishim.api29; 
import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;



import com.android.networkstack.apishim.CaptivePortalDataShim;

import com.android.networkstack.apishim.UnsupportedApiLevelException;

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

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



import org.json.JSONException;

import org.json.JSONObject;

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

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;



import com.android.networkstack.apishim.CaptivePortalDataShim;

import com.android.networkstack.apishim.NetworkInformationShim;

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

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



import java.net.Inet4Address;

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

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import android.net.Network; 


import androidx.annotation.NonNull;



import com.android.networkstack.apishim.NetworkShim;

import com.android.networkstack.apishim.UnsupportedApiLevelException;

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

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

/**

 * Implementation of NetworkShim for API 29.

 */

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.net.util.SocketUtils; 


import androidx.annotation.NonNull;



import com.android.networkstack.apishim.SocketUtilsShim;

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



import java.net.SocketAddress;