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

Commit 2ed590c2 authored by yinxu's avatar yinxu
Browse files

Explicitly opt-in to get location data from WifiInfo 

Bug: 182615941
Test: Manual Tests
Change-Id: I55b21a323026af8d83c2f2ba3de47dce17788eb9
parent b1099261

packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java

+4 −2
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public class WifiStatusTracker { 
            .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)

            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)

            .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR).build();

    private final NetworkCallback mNetworkCallback = new NetworkCallback() {

    private final NetworkCallback mNetworkCallback =

            new NetworkCallback(NetworkCallback.FLAG_INCLUDE_LOCATION_INFO) {

        @Override

        public void onAvailable(

                Network network, NetworkCapabilities networkCapabilities,
@@ -131,7 +132,8 @@ public class WifiStatusTracker { 
            }

        }

    };

    private final NetworkCallback mDefaultNetworkCallback = new NetworkCallback() {

    private final NetworkCallback mDefaultNetworkCallback =

            new NetworkCallback(NetworkCallback.FLAG_INCLUDE_LOCATION_INFO) {

        @Override

        public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {

            // network is now the default network, and its capabilities are nc.

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.res.Configuration;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkScoreManager;
@@ -307,7 +308,8 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            mWifiManager.registerScanResultsCallback(mReceiverHandler::post, scanResultsCallback);

        }



        ConnectivityManager.NetworkCallback callback = new ConnectivityManager.NetworkCallback(){

        NetworkCallback callback =

                new NetworkCallback(NetworkCallback.FLAG_INCLUDE_LOCATION_INFO){

            private Network mLastNetwork;

            private NetworkCapabilities mLastNetworkCapabilities;