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

Commit db812902 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixes for null WifiManager." into rvc-dev-plus-aosp am: 7e2e2053 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11336055

Change-Id: If1392627b8ba0a6051e5f5e83d8087dff57c0406
parents 9b4373b5 7e2e2053

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
@@ -312,6 +312,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,