From 3c2c658791ddef6cc096fdd2e898f06df07813c3 Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Wed, 27 Mar 2019 14:39:19 -0700 Subject: [PATCH] Added null pointer check for mWifiConfig.macRandomizationSetting Without the null pointer check, a passpoint network in the saved networks page will throw a NullPointerException since there is no config associated with it. Bug: 129422562 Test: manual Change-Id: I4a085a16c4181b7bdfe46c279e579d34ba314d81 --- .../settings/wifi/details/WifiDetailPreferenceController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index 955525dd859..22b9376152a 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -663,7 +663,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController } // return randomized MAC address - if (mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { + if (mWifiConfig != null && + mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) { return mWifiConfig.getRandomizedMacAddress().toString(); }