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

Commit 7bb940e6 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Bump NetworkStack to system_30" into rvc-dev

parents d8fa6685 03bcf6cb

Android.bp

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




java_defaults {

java_defaults {

    name: "NetworkStackReleaseApiLevel",

    name: "NetworkStackReleaseApiLevel",

    sdk_version: "system_29",

    // TODO: use system_30 once a prebuilt SDK is available for R

    sdk_version: "system_current",

    min_sdk_version: "29",

    min_sdk_version: "29",

    target_sdk_version: "29",

    target_sdk_version: "30",

}

}





// Filegroups for the API shims

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

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

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

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

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

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

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

        ":networkstack-module-utils-srcs",

        ":networkstack-module-utils-srcs",

    ],

    ],

}

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

    srcs: [

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

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

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

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

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

        ":networkstack-module-utils-srcs",

        ":networkstack-module-utils-srcs",

    ],

    ],

}

}

apishim/30/com/android/networkstack/apishim/CaptivePortalDataShimImpl.java→apishim/30/com/android/networkstack/apishim/api30/CaptivePortalDataShimImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.networkstack.apishim;

package com.android.networkstack.apishim.api30;





import android.net.CaptivePortalData;

import android.net.CaptivePortalData;

import android.net.INetworkMonitorCallbacks;

import android.net.INetworkMonitorCallbacks;

apishim/30/com/android/networkstack/apishim/ConstantsShim.java→apishim/30/com/android/networkstack/apishim/api30/ConstantsShim.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.networkstack.apishim;

package com.android.networkstack.apishim.api30;





import static android.net.ConnectivityDiagnosticsManager.DataStallReport;

import static android.net.ConnectivityDiagnosticsManager.DataStallReport;

apishim/30/com/android/networkstack/apishim/NetworkInformationShimImpl.java→apishim/30/com/android/networkstack/apishim/api30/NetworkInformationShimImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.networkstack.apishim;

package com.android.networkstack.apishim.api30;





import android.net.IpPrefix;

import android.net.IpPrefix;

import android.net.LinkProperties;

import android.net.LinkProperties;

apishim/30/com/android/networkstack/apishim/NetworkShimImpl.java→apishim/30/com/android/networkstack/apishim/api30/NetworkShimImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.networkstack.apishim;

package com.android.networkstack.apishim.api30;





import android.net.Network;

import android.net.Network;

import android.os.Build;

import android.os.Build;