commit e519f1f66067a90fd3a1302f56308c6f862be467
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 25 04:04:31 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 25 04:04:31 2021 +0000
tree ba876a0ed17c87e6f2a96e614a78ad4442466e55
parent 81a276038bff52ac4f50ce86f4b2cadc9d400ddc
parent b1843df777b30e066566d87347a88a6dba412586

Merge cherrypicks of [16090406] into sc-qpr1-d-release.

Change-Id: I53c838fb447e1e3ef5ac0d03de7353e6fc8c01ef

service/java/com/android/server/wifi/HalDeviceManager.java

diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
index 1f0d150..8cd1af8 100644
--- a/service/java/com/android/server/wifi/HalDeviceManager.java
+++ b/service/java/com/android/server/wifi/HalDeviceManager.java
@@ -1028,7 +1028,7 @@
                                 @Override
                                 public void onChipReconfigureFailure(WifiStatus status)
                                         throws RemoteException {
-                                    Log.d(TAG, "onChipReconfigureFailure: status=" + statusString(
+                                    Log.e(TAG, "onChipReconfigureFailure: status=" + statusString(
                                             status));
                                 }
 
@@ -1690,7 +1690,13 @@
             if (bestIfaceCreationProposal != null) {
                 IWifiIface iface = executeChipReconfiguration(bestIfaceCreationProposal,
                         createIfaceType);
-                if (iface != null) {
+                if (iface == null) {
+                    // If the chip reconfiguration failed, we'll need to clean up internal state.
+                    Log.e(TAG, "Teardown Wifi internal state");
+                    mWifi = null;
+                    mIsReady = false;
+                    teardownInternal();
+                } else {
                     InterfaceCacheEntry cacheEntry = new InterfaceCacheEntry();
 
                     cacheEntry.chip = bestIfaceCreationProposal.chipInfo.chip;
@@ -1713,7 +1719,7 @@
             }
         }
 
-        Log.d(TAG, "createIfaceIfPossible: Failed to create iface for ifaceType=" + createIfaceType
+        Log.e(TAG, "createIfaceIfPossible: Failed to create iface for ifaceType=" + createIfaceType
                 + ", requestorWs=" + requestorWs);
         return null;
     }