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

Commit 32f3943b authored by David Su's avatar David Su
Browse files

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
parent 0e186edf

wifi/java/android/net/wifi/INetworkRequestMatchCallback.aidl

+1 −2
Original line number Diff line number Diff line
@@ -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);

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

+4 −5
Original line number Diff line number Diff line
@@ -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);