diff options
| author | 2020-01-17 17:14:02 -0800 | |
|---|---|---|
| committer | 2020-01-17 17:15:58 -0800 | |
| commit | 32f3943b8d812319b936e7acb6cd95616ea0b4fc (patch) | |
| tree | 3eb8a75b503f92705952bd3acbbc974f667770c0 | |
| parent | 0e186edfbb176babb65c207896b060e803c7df23 (diff) | |
Fully qualify android.net.wifi.ScanResult
Somehow the AIDL compiler is confusing
android.net.wifi.ScanResult with
android.bluetooth.le.ScanResult.
For some reason fully qualifying ScanResult
instead of having a single import at the top
fixes the problem.
Bug: 147918827
Test: m ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I93b9006cb1741ba0d723ffaa8b2a84ff96c7312e
| -rw-r--r-- | wifi/java/android/net/wifi/INetworkRequestMatchCallback.aidl | 3 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/wifi/java/android/net/wifi/INetworkRequestMatchCallback.aidl b/wifi/java/android/net/wifi/INetworkRequestMatchCallback.aidl index d14ec57ea07a..51d74f0fcfa9 100644 --- a/wifi/java/android/net/wifi/INetworkRequestMatchCallback.aidl +++ b/wifi/java/android/net/wifi/INetworkRequestMatchCallback.aidl @@ -17,7 +17,6 @@ package android.net.wifi; import android.net.wifi.INetworkRequestUserSelectionCallback; -import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; /** @@ -31,7 +30,7 @@ oneway interface INetworkRequestMatchCallback void onAbort(); - void onMatch(in List<ScanResult> scanResults); + void onMatch(in List<android.net.wifi.ScanResult> scanResults); void onUserSelectionConnectSuccess(in WifiConfiguration wificonfiguration); diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 5a98ac86e783..54091a6f4a67 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -36,7 +36,6 @@ 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; @@ -61,9 +60,9 @@ interface IWifiManager ParceledListSlice getPrivilegedConfiguredNetworks(String packageName, String featureId); - Map getAllMatchingFqdnsForScanResults(in List<ScanResult> scanResult); + Map getAllMatchingFqdnsForScanResults(in List<android.net.wifi.ScanResult> scanResult); - Map getMatchingOsuProviders(in List<ScanResult> scanResult); + Map getMatchingOsuProviders(in List<android.net.wifi.ScanResult> scanResult); Map getMatchingPasspointConfigsForOsuProviders(in List<OsuProvider> osuProviders); @@ -97,7 +96,7 @@ interface IWifiManager boolean startScan(String packageName, String featureId); - List<ScanResult> getScanResults(String callingPackage, String callingFeatureId); + List<android.net.wifi.ScanResult> getScanResults(String callingPackage, String callingFeatureId); boolean disconnect(String packageName); @@ -254,7 +253,7 @@ interface IWifiManager int calculateSignalLevel(int rssi); - List<WifiConfiguration> getWifiConfigForMatchedNetworkSuggestionsSharedWithUser(in List<ScanResult> scanResults); + List<WifiConfiguration> getWifiConfigForMatchedNetworkSuggestionsSharedWithUser(in List<android.net.wifi.ScanResult> scanResults); boolean setWifiConnectedNetworkScorer(in IBinder binder, in IWifiConnectedNetworkScorer scorer); |