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

Commit 74f5161e authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "framework-wifi: Migrate ParceledListSlice to the version from module-utils"

parents 3e37b2b9 e4bea7b1

Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -1335,8 +1335,6 @@ java_library { 
    sdk_version: "module_current",

    min_sdk_version: "30",

    srcs: [

        "core/java/android/content/pm/BaseParceledListSlice.java",

        "core/java/android/content/pm/ParceledListSlice.java",

        "core/java/android/os/HandlerExecutor.java",

        "core/java/com/android/internal/util/AsyncChannel.java",

        "core/java/com/android/internal/util/AsyncService.java",
@@ -1355,12 +1353,6 @@ java_library { 
    ],

}



filegroup {

    name: "framework-wifi-util-lib-aidls",

    srcs: ["core/java/android/content/pm/ParceledListSlice.aidl"],

    path: "core/java",

}



// utility classes statically linked into wifi-service

filegroup {

    name: "framework-wifi-service-shared-srcs",

wifi/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ filegroup { 
    srcs: [

        ":framework-wifi-updatable-java-sources",

        ":framework-wifi-updatable-exported-aidl-sources",

        ":module-utils-os-aidls",

    ],

}
@@ -85,13 +86,14 @@ java_defaults { 
        "framework-wifi-util-lib",

        "android.hardware.wifi-V1.0-java-constants",

        "modules-utils-build",

        "modules-utils-os",

    ],

    libs: [

        "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage

    ],

    srcs: [

        ":framework-wifi-updatable-sources",

        ":framework-wifi-util-lib-aidls",

        ":module-utils-os-aidls",

    ],

}

wifi/jarjar-rules.txt

+0 −2
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ rule org.ksoap2.** com.android.wifi.x.@0 
rule fi.iki.elonen.** com.android.wifi.x.@0



## used by both framework-wifi and service-wifi ##

rule android.content.pm.BaseParceledListSlice* com.android.wifi.x.@0

rule android.content.pm.ParceledListSlice* com.android.wifi.x.@0

rule android.os.HandlerExecutor* com.android.wifi.x.@0

rule android.telephony.Annotation* com.android.wifi.x.@0

rule com.android.internal.util.AsyncChannel* com.android.wifi.x.@0

wifi/java/android/net/wifi/IWifiManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.net.wifi;



import android.content.pm.ParceledListSlice;



import android.net.wifi.hotspot2.OsuProvider;

import android.net.wifi.hotspot2.PasspointConfiguration;

import android.net.wifi.hotspot2.IProvisioningCallback;
@@ -47,6 +45,8 @@ import android.os.Messenger; 
import android.os.ResultReceiver;

import android.os.WorkSource;



import com.android.modules.utils.ParceledListSlice;



/**

 * Interface that allows controlling and querying Wi-Fi connectivity.

 *

wifi/java/android/net/wifi/WifiManager.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.annotation.SystemService; 
import android.app.ActivityManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.pm.ParceledListSlice;

import android.net.ConnectivityManager;

import android.net.DhcpInfo;

import android.net.MacAddress;
@@ -63,6 +62,7 @@ import android.util.SparseArray; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.utils.ParceledListSlice;

import com.android.modules.utils.build.SdkLevel;



import java.lang.annotation.Retention;