Merge changes from topic 'system-vendor-internal-pick'
* changes:
libwifi-hal-common: Work with BOARD_VNDK_VERSION
FrameworksWifiTests: Remove system -> vendor dep.
libwifi-hal-(common|fallback): LOCAL_VENDOR_MODULE
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index ccd1d46..21d6be1 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -5800,7 +5800,9 @@
// If this network was explicitly selected by the user, evaluate whether to call
// explicitlySelected() so the system can treat it appropriately.
WifiConfiguration config = getCurrentWifiConfiguration();
- if (mWifiConfigManager.getLastSelectedNetwork() == config.networkId) {
+ if (config == null) {
+ Log.wtf(TAG, "Current WifiConfiguration is null, but IP provisioning just succeeded");
+ } else if (mWifiConfigManager.getLastSelectedNetwork() == config.networkId) {
boolean prompt =
mWifiPermissionsUtil.checkConfigOverridePermission(config.lastConnectUid);
if (mVerboseLoggingEnabled) {
