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

Commit e0c64998 authored by David Su's avatar David Su
Browse files

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

This reverts commit 32f3943b.

Reason for revert: Underlying bug in the AIDL compiler has been fixed.
Reverting this workaround.

Bug: 147918827
Change-Id: Ide138668040da7517c9099ef9c5d17a75dc16524
Test: m ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
parent 32f3943b

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

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

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

+5 −4
Original line number Diff line number Diff line
@@ -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);
@@ -96,7 +97,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);
@@ -253,7 +254,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);