Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot."

Browse Source 
am: c046f9f039

Change-Id: I362b05f32fc26a7233bd4dd26b3e941c8d2e9a46
This commit is contained in:
Roshan Pius
2019-08-27 10:19:55 -07:00
committed by android-build-merger
parent f18917783c c046f9f039
commit aa562f6dc3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -3206,6 +3206,7 @@ public class WifiManager {
private final CloseGuard mCloseGuard = CloseGuard.get(); private final CloseGuard mCloseGuard = CloseGuard.get();
private final WifiConfiguration mConfig; private final WifiConfiguration mConfig;
private boolean mClosed = false;
/** @hide */ /** @hide */
@VisibleForTesting @VisibleForTesting
@@ -3221,8 +3222,13 @@ public class WifiManager {
@Override @Override
public void close() { public void close() {
try { try {
stopLocalOnlyHotspot(); synchronized (mLock) {
mCloseGuard.close(); if (!mClosed) {
mClosed = true;
stopLocalOnlyHotspot();
mCloseGuard.close();
}
}
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Failed to stop Local Only Hotspot."); Log.e(TAG, "Failed to stop Local Only Hotspot.");
} }