wifi: Add disabling check to avoid enable multi SoftApManager

Issue flow:
stopSoftAp ->state change to DISABLING -> startSoftAp call(Allow to enable)
-> state change to Enabling -> state update to Disable (Updated by stopSoftAp)
-> startSoftAp call again cause multi SoftApManager

Bug: 151906797
Test: atest FrameworksWifiTest
Change-Id: I3e6ac31c6d9b143bc2e81a650bc7f0b07d407666

1 files changed, 4 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 2e9372874..4e07e5ef3 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -1035,8 +1035,10 @@ public class WifiServiceImpl extends BaseWifiService {
 
         public boolean setEnablingIfAllowed() {
             synchronized (mLock) {
-                if (mTetheredSoftApState == WIFI_AP_STATE_ENABLING) return false;
-                if (mTetheredSoftApState == WIFI_AP_STATE_ENABLED) return false;
+                if (mTetheredSoftApState != WIFI_AP_STATE_DISABLED
+                        && mTetheredSoftApState != WIFI_AP_STATE_FAILED) {
+                    return false;
+                }
                 mTetheredSoftApState = WIFI_AP_STATE_ENABLING;
                 return true;
             }