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

Commit 3f57f37c authored by Peter Collingbourne's avatar Peter Collingbourne
Browse files

Fixes for null WifiManager. 

The WifiManager may be null on devices that do not support wifi,
such as FVP.

Bug: 142352330
Change-Id: If6054c941bc8620cde805dd114111b6b2b0770ea
parent 199e0cf8

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

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ public class WifiStatusTracker { 
    }



    private void updateStatusLabel() {

        if (mWifiManager == null) {

            return;

        }

        NetworkCapabilities networkCapabilities;

        final Network currentWifiNetwork = mWifiManager.getCurrentNetwork();

        if (currentWifiNetwork != null && currentWifiNetwork.equals(mDefaultNetwork)) {

packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ public class SystemServicesModule { 


    @Provides

    @Singleton

    @Nullable

    static WifiManager provideWifiManager(Context context) {

        return context.getSystemService(WifiManager.class);

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_NO 
import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT;

import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;



import android.annotation.Nullable;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -175,7 +176,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    public NetworkControllerImpl(Context context, @Background Looper bgLooper,

            DeviceProvisionedController deviceProvisionedController,

            BroadcastDispatcher broadcastDispatcher, ConnectivityManager connectivityManager,

            TelephonyManager telephonyManager, WifiManager wifiManager,

            TelephonyManager telephonyManager, @Nullable WifiManager wifiManager,

            NetworkScoreManager networkScoreManager) {

        this(context, connectivityManager,

                telephonyManager,