summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Chien <markchien@google.com> 2019-08-01 04:25:05 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-01 04:25:05 -0700
commit4724e40ffa5617babfe237b8facbe3edab577438 (patch)
treecc1c218867bed1f852f0fed378d8a285db0007da
parentea493e4c77c74f673a779424c5776e4b921351e9 (diff)
parent0a4baeae84caaf4dc8f4f558237d99dc5d8ef767 (diff)
Merge "Fix the race between entitlement start/stop"
am: 0a4baeae84 Change-Id: If28fb2159672cf58058229f4cb7ee2d549ca15a8
-rw-r--r--services/core/java/com/android/server/connectivity/Tethering.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 4957eed21c70..73d160d8c444 100644
--- 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;
}
}