Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: If1392627b8ba0a6051e5f5e83d8087dff57c0406
This commit is contained in:
TreeHugger Robot
2020-07-01 06:08:38 +00:00
committed by Automerger Merge Worker
parent 9b4373b519 7e2e20538e
commit db81290280
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
View File

@@ -214,6 +214,9 @@ public class WifiStatusTracker {
} }
private void updateStatusLabel() { private void updateStatusLabel() {
if (mWifiManager == null) {
return;
}
NetworkCapabilities networkCapabilities; NetworkCapabilities networkCapabilities;
final Network currentWifiNetwork = mWifiManager.getCurrentNetwork(); final Network currentWifiNetwork = mWifiManager.getCurrentNetwork();
if (currentWifiNetwork != null && currentWifiNetwork.equals(mDefaultNetwork)) { if (currentWifiNetwork != null && currentWifiNetwork.equals(mDefaultNetwork)) {

1
packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java
View File

@@ -312,6 +312,7 @@ public class SystemServicesModule {
@Provides @Provides
@Singleton @Singleton
@Nullable
static WifiManager provideWifiManager(Context context) { static WifiManager provideWifiManager(Context context) {
return context.getSystemService(WifiManager.class); return context.getSystemService(WifiManager.class);
} }

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

@@ -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.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT;
import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE; import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;
import android.annotation.Nullable;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -175,7 +176,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
public NetworkControllerImpl(Context context, @Background Looper bgLooper, public NetworkControllerImpl(Context context, @Background Looper bgLooper,
DeviceProvisionedController deviceProvisionedController, DeviceProvisionedController deviceProvisionedController,
BroadcastDispatcher broadcastDispatcher, ConnectivityManager connectivityManager, BroadcastDispatcher broadcastDispatcher, ConnectivityManager connectivityManager,
TelephonyManager telephonyManager, WifiManager wifiManager, TelephonyManager telephonyManager, @Nullable WifiManager wifiManager,
NetworkScoreManager networkScoreManager) { NetworkScoreManager networkScoreManager) {
this(context, connectivityManager, this(context, connectivityManager,
telephonyManager, telephonyManager,