Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fully qualify android.net.wifi.ScanResult""

Browse Source
This commit is contained in:
David Su
2020-01-23 18:41:29 +00:00
committed by Android (Google) Code Review
parent 2de4b214d2 e0c64998e4
commit ae531bd983
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/INetworkRequestMatchCallback.aidl
View File

@@ -17,6 +17,7 @@
package android.net.wifi;
import android.net.wifi.INetworkRequestUserSelectionCallback;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
/**
@@ -30,7 +31,7 @@ oneway interface INetworkRequestMatchCallback
void onAbort();
void onMatch(in List<android.net.wifi.ScanResult> scanResults);
void onMatch(in List<ScanResult> scanResults);
void onUserSelectionConnectSuccess(in WifiConfiguration wificonfiguration);

9
wifi/java/android/net/wifi/IWifiManager.aidl
View File

@@ -36,6 +36,7 @@ import android.net.wifi.ISuggestionConnectionStatusListener;
import android.net.wifi.ITrafficStateCallback;
import android.net.wifi.ITxPacketCountListener;
import android.net.wifi.IWifiConnectedNetworkScorer;
import android.net.wifi.ScanResult;
import android.net.wifi.SoftApConfiguration;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
@@ -60,9 +61,9 @@ interface IWifiManager
ParceledListSlice getPrivilegedConfiguredNetworks(String packageName, String featureId);
Map getAllMatchingFqdnsForScanResults(in List<android.net.wifi.ScanResult> scanResult);
Map getAllMatchingFqdnsForScanResults(in List<ScanResult> scanResult);
Map getMatchingOsuProviders(in List<android.net.wifi.ScanResult> scanResult);
Map getMatchingOsuProviders(in List<ScanResult> scanResult);
Map getMatchingPasspointConfigsForOsuProviders(in List<OsuProvider> osuProviders);
@@ -98,7 +99,7 @@ interface IWifiManager
boolean startScan(String packageName, String featureId);
List<android.net.wifi.ScanResult> getScanResults(String callingPackage, String callingFeatureId);
List<ScanResult> getScanResults(String callingPackage, String callingFeatureId);
boolean disconnect(String packageName);
@@ -255,7 +256,7 @@ interface IWifiManager
int calculateSignalLevel(int rssi);
List<WifiConfiguration> getWifiConfigForMatchedNetworkSuggestionsSharedWithUser(in List<android.net.wifi.ScanResult> scanResults);
List<WifiConfiguration> getWifiConfigForMatchedNetworkSuggestionsSharedWithUser(in List<ScanResult> scanResults);
boolean setWifiConnectedNetworkScorer(in IBinder binder, in IWifiConnectedNetworkScorer scorer);