Merge "Fix the race between entitlement start/stop" into qt-r1-dev

am: 5d6e98773f Change-Id: I93579ad97c4acaf9c0f362a5adf2136b134050fb
2019-08-01 19:24:33 -07:00
parent 1ed86c9cf1 5d6e98773f
commit 03bd7b0ee3
1 changed files with 0 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -772,7 +772,6 @@ public class Tethering extends BaseNetworkObserver {
                    case WifiManager.WIFI_AP_STATE_FAILED:
                    default:
                        disableWifiIpServingLocked(ifname, curState);
-                        mEntitlementMgr.stopProvisioningIfNeeded(TETHERING_WIFI);
                        break;
                }
            }