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

Commit 67933143 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Bump NetworkStack to system_30 

NetworkStack can use system_30 now that system_30 exists.
This change moves the "current" API shims to api30, and adds an api31
shim.

Test: atest NetworkStackTests NetworkStackNextTests, manual (Wifi,
          telephony working)
Bug: 143586229
(clean cherry-pick from internal branch)
Merged-In: I37ca0e5a8a5c5620f5fed478648853b668e87f50

Change-Id: I37ca0e5a8a5c5620f5fed478648853b668e87f50
parent 3f32101a

Android.bp

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


java_defaults {

    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",

    target_sdk_version: "29",

    target_sdk_version: "30",

}



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

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

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

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

        ":networkstack-module-utils-srcs",

    ],

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

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

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

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

        ":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 Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.networkstack.apishim;

package com.android.networkstack.apishim.api30;



import android.net.CaptivePortalData;

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 Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.networkstack.apishim;

package com.android.networkstack.apishim.api30;



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 Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.networkstack.apishim;

package com.android.networkstack.apishim.api30;



import android.net.IpPrefix;

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 Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.networkstack.apishim;

package com.android.networkstack.apishim.api30;



import android.net.Network;

import android.os.Build;