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

Commit 804d94a1 authored by Etan Cohen's avatar Etan Cohen
Browse files

[WifiNl80211] Rename WifiNl80211Manager namespace 

Finish the renaming process from wificond -> nl80211.

Bug: 149105833
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: Icf94799b560da66a5366743fd2a33b0f152da335
parent 37393377

api/system-current.txt

+107 −107
Original line number Diff line number Diff line
@@ -8162,94 +8162,7 @@ package android.net.wifi.hotspot2 { 














}



























package android.net.wifi.p2p {

























  public final class WifiP2pGroupList implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.List<android.net.wifi.p2p.WifiP2pGroup> getGroupList();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pGroupList> CREATOR;













  }

























  public class WifiP2pManager {













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void deletePersistentGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void factoryReset(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public void requestPersistentGroupInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setDeviceName(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull String, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(allOf={android.Manifest.permission.CONNECTIVITY_INTERNAL, android.Manifest.permission.CONFIGURE_WIFI_DISPLAY}) public void setMiracastMode(int);













    method @RequiresPermission(android.Manifest.permission.CONFIGURE_WIFI_DISPLAY) public void setWfdInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pWfdInfo, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setWifiP2pChannels(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void startListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void stopListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    field public static final String ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED = "android.net.wifi.p2p.action.WIFI_P2P_PERSISTENT_GROUPS_CHANGED";













    field public static final int MIRACAST_DISABLED = 0; // 0x0













    field public static final int MIRACAST_SINK = 2; // 0x2













    field public static final int MIRACAST_SOURCE = 1; // 0x1













  }

























  public static interface WifiP2pManager.PersistentGroupInfoListener {













    method public void onPersistentGroupInfoAvailable(@NonNull android.net.wifi.p2p.WifiP2pGroupList);













  }

























}

























package android.net.wifi.rtt {

























  public static final class RangingRequest.Builder {













    method public android.net.wifi.rtt.RangingRequest.Builder addResponder(@NonNull android.net.wifi.rtt.ResponderConfig);













  }

























  public final class RangingResult implements android.os.Parcelable {













    method @NonNull public byte[] getLci();













    method @NonNull public byte[] getLcr();













  }

























  public final class ResponderConfig implements android.os.Parcelable {













    ctor public ResponderConfig(@NonNull android.net.MacAddress, int, boolean, int, int, int, int, int);













    ctor public ResponderConfig(@NonNull android.net.wifi.aware.PeerHandle, int, boolean, int, int, int, int, int);













    method public int describeContents();













    method public static android.net.wifi.rtt.ResponderConfig fromScanResult(android.net.wifi.ScanResult);













    method public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerHandleWithDefaults(android.net.wifi.aware.PeerHandle);













    method public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerMacAddressWithDefaults(android.net.MacAddress);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final int CHANNEL_WIDTH_160MHZ = 3; // 0x3













    field public static final int CHANNEL_WIDTH_20MHZ = 0; // 0x0













    field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1













    field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2













    field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.rtt.ResponderConfig> CREATOR;













    field public static final int PREAMBLE_HE = 3; // 0x3













    field public static final int PREAMBLE_HT = 1; // 0x1













    field public static final int PREAMBLE_LEGACY = 0; // 0x0













    field public static final int PREAMBLE_VHT = 2; // 0x2













    field public static final int RESPONDER_AP = 0; // 0x0













    field public static final int RESPONDER_AWARE = 4; // 0x4













    field public static final int RESPONDER_P2P_CLIENT = 3; // 0x3













    field public static final int RESPONDER_P2P_GO = 2; // 0x2













    field public static final int RESPONDER_STA = 1; // 0x1













    field public final int centerFreq0;













    field public final int centerFreq1;













    field public final int channelWidth;













    field public final int frequency;













    field public final android.net.MacAddress macAddress;













    field public final android.net.wifi.aware.PeerHandle peerHandle;













    field public final int preamble;













    field public final int responderType;













    field public final boolean supports80211mc;













  }

























  public final class ResponderLocation implements android.os.Parcelable {













    method public boolean getExtraInfoOnAssociationIndication();













  }

























  public class WifiRttManager {













    method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE}) public void cancelRanging(@Nullable android.os.WorkSource);













    method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE}) public void startRanging(@Nullable android.os.WorkSource, @NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);













  }

























}

























package android.net.wifi.wificond {













package android.net.wifi.nl80211 {





























  public final class DeviceWiphyCapabilities implements android.os.Parcelable {















    ctor public DeviceWiphyCapabilities();









@@ -8263,7 +8176,7 @@ package android.net.wifi.wificond {













    method public void setMaxNumberTxSpatialStreams(int);















    method public void setWifiStandardSupport(int, boolean);















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.DeviceWiphyCapabilities> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.nl80211.DeviceWiphyCapabilities> CREATOR;















  }





























  public final class NativeScanResult implements android.os.Parcelable {









@@ -8273,7 +8186,7 @@ package android.net.wifi.wificond {













    method public int getCapabilities();















    method public int getFrequencyMhz();















    method @NonNull public byte[] getInformationElements();













    method @NonNull public java.util.List<android.net.wifi.wificond.RadioChainInfo> getRadioChainInfos();













    method @NonNull public java.util.List<android.net.wifi.nl80211.RadioChainInfo> getRadioChainInfos();















    method public int getSignalMbm();















    method @NonNull public byte[] getSsid();















    method public long getTsf();









@@ -8295,7 +8208,7 @@ package android.net.wifi.wificond {













    field public static final int BSS_CAPABILITY_SHORT_PREAMBLE = 32; // 0x20















    field public static final int BSS_CAPABILITY_SHORT_SLOT_TIME = 1024; // 0x400















    field public static final int BSS_CAPABILITY_SPECTRUM_MANAGEMENT = 256; // 0x100













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.NativeScanResult> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.nl80211.NativeScanResult> CREATOR;















  }





























  public final class NativeWifiClient implements android.os.Parcelable {









@@ -8303,7 +8216,7 @@ package android.net.wifi.wificond {













    method public int describeContents();















    method @Nullable public android.net.MacAddress getMacAddress();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.NativeWifiClient> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.nl80211.NativeWifiClient> CREATOR;















  }





























  public final class PnoNetwork implements android.os.Parcelable {









@@ -8316,7 +8229,7 @@ package android.net.wifi.wificond {













    method public void setHidden(boolean);















    method public void setSsid(@NonNull byte[]);















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.PnoNetwork> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.nl80211.PnoNetwork> CREATOR;















  }





























  public final class PnoSettings implements android.os.Parcelable {









@@ -8326,14 +8239,14 @@ package android.net.wifi.wificond {













    method public int getMin2gRssiDbm();















    method public int getMin5gRssiDbm();















    method public int getMin6gRssiDbm();













    method @NonNull public java.util.List<android.net.wifi.wificond.PnoNetwork> getPnoNetworks();













    method @NonNull public java.util.List<android.net.wifi.nl80211.PnoNetwork> getPnoNetworks();















    method public void setIntervalMillis(long);















    method public void setMin2gRssiDbm(int);















    method public void setMin5gRssiDbm(int);















    method public void setMin6gRssiDbm(int);













    method public void setPnoNetworks(@NonNull java.util.List<android.net.wifi.wificond.PnoNetwork>);













    method public void setPnoNetworks(@NonNull java.util.List<android.net.wifi.nl80211.PnoNetwork>);















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.PnoSettings> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.nl80211.PnoSettings> CREATOR;















  }





























  public final class RadioChainInfo implements android.os.Parcelable {









@@ -8342,24 +8255,24 @@ package android.net.wifi.wificond {













    method public int getChainId();















    method public int getLevelDbm();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.RadioChainInfo> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.nl80211.RadioChainInfo> CREATOR;















  }





























  public class WifiNl80211Manager {















    method public void abortScan(@NonNull String);















    method public void enableVerboseLogging(boolean);















    method @NonNull public int[] getChannelsMhzForBand(int);













    method @Nullable public android.net.wifi.wificond.DeviceWiphyCapabilities getDeviceWiphyCapabilities(@NonNull String);













    method @NonNull public java.util.List<android.net.wifi.wificond.NativeScanResult> getScanResults(@NonNull String, int);













    method @Nullable public android.net.wifi.wificond.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);













    method @Nullable public static android.net.wifi.wificond.WifiNl80211Manager.OemSecurityType parseOemSecurityTypeElement(int, int, @NonNull byte[]);













    method public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiNl80211Manager.SoftApCallback);













    method public void sendMgmtFrame(@NonNull String, @NonNull byte[], int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiNl80211Manager.SendMgmtFrameCallback);













    method @Nullable public android.net.wifi.nl80211.DeviceWiphyCapabilities getDeviceWiphyCapabilities(@NonNull String);













    method @NonNull public java.util.List<android.net.wifi.nl80211.NativeScanResult> getScanResults(@NonNull String, int);













    method @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);













    method @Nullable public static android.net.wifi.nl80211.WifiNl80211Manager.OemSecurityType parseOemSecurityTypeElement(int, int, @NonNull byte[]);













    method public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SoftApCallback);













    method public void sendMgmtFrame(@NonNull String, @NonNull byte[], int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SendMgmtFrameCallback);















    method public void setOnServiceDeadCallback(@NonNull Runnable);













    method public boolean setupInterfaceForClientMode(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiNl80211Manager.ScanEventCallback, @NonNull android.net.wifi.wificond.WifiNl80211Manager.ScanEventCallback);













    method public boolean setupInterfaceForClientMode(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.ScanEventCallback, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.ScanEventCallback);















    method public boolean setupInterfaceForSoftApMode(@NonNull String);













    method @Nullable public android.net.wifi.wificond.WifiNl80211Manager.SignalPollResult signalPoll(@NonNull String);













    method public boolean startPnoScan(@NonNull String, @NonNull android.net.wifi.wificond.PnoSettings, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiNl80211Manager.PnoScanRequestCallback);













    method @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.SignalPollResult signalPoll(@NonNull String);













    method public boolean startPnoScan(@NonNull String, @NonNull android.net.wifi.nl80211.PnoSettings, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.PnoScanRequestCallback);















    method public boolean startScan(@NonNull String, int, @Nullable java.util.Set<java.lang.Integer>, @Nullable java.util.List<byte[]>);















    method public boolean stopPnoScan(@NonNull String);















    method public boolean tearDownClientInterface(@NonNull String);










@@ -8405,7 +8318,7 @@ package android.net.wifi.wificond {













  }





























  public static interface WifiNl80211Manager.SoftApCallback {













    method public void onConnectedClientsChanged(@NonNull android.net.wifi.wificond.NativeWifiClient, boolean);













    method public void onConnectedClientsChanged(@NonNull android.net.wifi.nl80211.NativeWifiClient, boolean);















    method public void onFailure();















    method public void onSoftApChannelSwitched(int, int);















  }









@@ -8417,6 +8330,93 @@ package android.net.wifi.wificond {



























}



























package android.net.wifi.p2p {

























  public final class WifiP2pGroupList implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.List<android.net.wifi.p2p.WifiP2pGroup> getGroupList();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pGroupList> CREATOR;













  }

























  public class WifiP2pManager {













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void deletePersistentGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void factoryReset(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public void requestPersistentGroupInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setDeviceName(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull String, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(allOf={android.Manifest.permission.CONNECTIVITY_INTERNAL, android.Manifest.permission.CONFIGURE_WIFI_DISPLAY}) public void setMiracastMode(int);













    method @RequiresPermission(android.Manifest.permission.CONFIGURE_WIFI_DISPLAY) public void setWfdInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pWfdInfo, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setWifiP2pChannels(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void startListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void stopListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);













    field public static final String ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED = "android.net.wifi.p2p.action.WIFI_P2P_PERSISTENT_GROUPS_CHANGED";













    field public static final int MIRACAST_DISABLED = 0; // 0x0













    field public static final int MIRACAST_SINK = 2; // 0x2













    field public static final int MIRACAST_SOURCE = 1; // 0x1













  }

























  public static interface WifiP2pManager.PersistentGroupInfoListener {













    method public void onPersistentGroupInfoAvailable(@NonNull android.net.wifi.p2p.WifiP2pGroupList);













  }

























}

























package android.net.wifi.rtt {

























  public static final class RangingRequest.Builder {













    method public android.net.wifi.rtt.RangingRequest.Builder addResponder(@NonNull android.net.wifi.rtt.ResponderConfig);













  }

























  public final class RangingResult implements android.os.Parcelable {













    method @NonNull public byte[] getLci();













    method @NonNull public byte[] getLcr();













  }

























  public final class ResponderConfig implements android.os.Parcelable {













    ctor public ResponderConfig(@NonNull android.net.MacAddress, int, boolean, int, int, int, int, int);













    ctor public ResponderConfig(@NonNull android.net.wifi.aware.PeerHandle, int, boolean, int, int, int, int, int);













    method public int describeContents();













    method public static android.net.wifi.rtt.ResponderConfig fromScanResult(android.net.wifi.ScanResult);













    method public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerHandleWithDefaults(android.net.wifi.aware.PeerHandle);













    method public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerMacAddressWithDefaults(android.net.MacAddress);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final int CHANNEL_WIDTH_160MHZ = 3; // 0x3













    field public static final int CHANNEL_WIDTH_20MHZ = 0; // 0x0













    field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1













    field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2













    field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.rtt.ResponderConfig> CREATOR;













    field public static final int PREAMBLE_HE = 3; // 0x3













    field public static final int PREAMBLE_HT = 1; // 0x1













    field public static final int PREAMBLE_LEGACY = 0; // 0x0













    field public static final int PREAMBLE_VHT = 2; // 0x2













    field public static final int RESPONDER_AP = 0; // 0x0













    field public static final int RESPONDER_AWARE = 4; // 0x4













    field public static final int RESPONDER_P2P_CLIENT = 3; // 0x3













    field public static final int RESPONDER_P2P_GO = 2; // 0x2













    field public static final int RESPONDER_STA = 1; // 0x1













    field public final int centerFreq0;













    field public final int centerFreq1;













    field public final int channelWidth;













    field public final int frequency;













    field public final android.net.MacAddress macAddress;













    field public final android.net.wifi.aware.PeerHandle peerHandle;













    field public final int preamble;













    field public final int responderType;













    field public final boolean supports80211mc;













  }

























  public final class ResponderLocation implements android.os.Parcelable {













    method public boolean getExtraInfoOnAssociationIndication();













  }

























  public class WifiRttManager {













    method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE}) public void cancelRanging(@Nullable android.os.WorkSource);













    method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE}) public void startRanging(@Nullable android.os.WorkSource, @NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);













  }

























}



























package android.nfc {





























  public final class NfcAdapter {

























api/system-lint-baseline.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -234,7 +234,7 @@ OnNameExpected: android.content.ContentProvider#checkUriPermission(android.net.U













    If implemented by developer, should follow the on<Something> style; otherwise consider marking final













































PairedRegistration: android.net.wifi.wificond.WifiNl80211Manager#registerApCallback(String, java.util.concurrent.Executor, android.net.wifi.wificond.WifiNl80211Manager.SoftApCallback):













PairedRegistration: android.net.wifi.nl80211.WifiNl80211Manager#registerApCallback(String, java.util.concurrent.Executor, android.net.wifi.nl80211.WifiNl80211Manager.SoftApCallback):















    

































































core/java/android/app/SystemServiceRegistry.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -132,7 +132,7 @@ import android.net.lowpan.LowpanManager;













import android.net.nsd.INsdManager;















import android.net.nsd.NsdManager;















import android.net.wifi.WifiFrameworkInitializer;













import android.net.wifi.wificond.WifiNl80211Manager;













import android.net.wifi.nl80211.WifiNl80211Manager;















import android.nfc.NfcManager;















import android.os.BatteryManager;















import android.os.BatteryStats;

































wifi/Android.bp



+1
−1




























Original line number
Diff line number
Diff line








@@ -48,7 +48,7 @@ filegroup {













        // to a separate package.















        "java/android/net/wifi/WifiNetworkScoreCache.java",















        "java/android/net/wifi/WifiOemMigrationHook.java",













        "java/android/net/wifi/wificond/*.java",













        "java/android/net/wifi/nl80211/*.java",















        ":libwificond_ipc_aidl",















    ],















}

































wifi/java/android/net/wifi/wificond/ChannelSettings.java→wifi/java/android/net/wifi/nl80211/ChannelSettings.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -14,7 +14,7 @@













 * limitations under the License.















 */





























package android.net.wifi.wificond;













package android.net.wifi.nl80211;































import android.os.Parcel;















import android.os.Parcelable;