From 5ea1c3ecd021854843bbc092d0bd27b784c833a0 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Tue, 19 Jan 2021 11:58:43 -0800 Subject: [PATCH] Don't crash SystemUI on missing WiFi Bug: 177921585 Test: flash tcu_host device and check if if boots Change-Id: Ib34e0841d4bf30dcb67c225a0d5c1e10ace729e2 --- .../systemui/statusbar/policy/NetworkControllerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 92d013eeda8e2..f1ccde771c545 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -294,7 +294,9 @@ public class NetworkControllerImpl extends BroadcastReceiver } }; - mWifiManager.registerScanResultsCallback(mReceiverHandler::post, scanResultsCallback); + if (mWifiManager != null) { + mWifiManager.registerScanResultsCallback(mReceiverHandler::post, scanResultsCallback); + } ConnectivityManager.NetworkCallback callback = new ConnectivityManager.NetworkCallback(){ private Network mLastNetwork;