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

Commit 9e208ff6 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-10057725-IDGRNKQGYI" 

* changes:
  Build framework-wifi against core_current & framework-system-stubs (Attempt 2)
  Fully qualify android.net.wifi.ScanResult
parents 40a7ffe9 439175f1

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -485,7 +485,6 @@ java_library { 
        "//frameworks/base/apex/permission/framework",

        "//frameworks/base/apex/statsd/service",

        "//frameworks/base/telephony",

        "//frameworks/base/wifi",

        "//frameworks/opt/net/wifi/service",

    ],

}

wifi/Android.bp

+15 −6
Original line number Diff line number Diff line
@@ -58,19 +58,20 @@ test_access_hidden_api_whitelist = [ 
// classes before they are renamed.

java_library {

    name: "framework-wifi-pre-jarjar",

    // TODO(b/140299412) should be core_current once we build against framework-system-stubs

    sdk_version: "core_platform",

    // TODO(b/146757305): sdk_version should be "module_lib_current"

    sdk_version: "core_current",

    static_libs: [

        "framework-wifi-util-lib",

        "android.hardware.wifi-V1.0-java-constants",

    ],

    libs: [

        // TODO(b/140299412) should be framework-system-stubs once we fix all @hide dependencies

        "framework-minus-apex",

        "framework-annotations-lib",

        "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage

        "unsupportedappusage-annotation", // for dalvik.annotation.compat.UnsupportedAppUsage

        "framework-telephony-stubs",

        // TODO(b/146757305): should be unnecessary once

        // sdk_version="module_lib_current"

        "android_system_stubs_current",

    ],

    srcs: [

        ":framework-wifi-updatable-sources",
@@ -80,13 +81,21 @@ java_library { 
        "//frameworks/opt/net/wifi/service",

        "//frameworks/opt/net/wifi/tests/wifitests",

    ],



    // TODO(b/146757305): should be unnecessary once

    // sdk_version="module_lib_current"

    aidl: {

        include_dirs: [

            "frameworks/base/core/java",

        ],

    },

}



// post-jarjar version of framework-wifi

java_library {

    name: "framework-wifi",

    // TODO(b/140299412) should be core_current once we build against framework-system-stubs

    sdk_version: "core_platform",

    // TODO(b/146757305): sdk_version should be "module_lib_current"

    sdk_version: "core_current",

    static_libs: [

        "framework-wifi-pre-jarjar",

    ],

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);
@@ -256,7 +255,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);