commit c73945bd841bb16d038471cd592b28db85e91951
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 08 06:11:19 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 08 06:11:19 2019 +0000
tree 598aa1a064b7509bf148056be9270c405ce09ebb
parent 22f1bf64db96c255942611724d7467e9e4f41fdf
parent 166f256958a04bc08cd0d849c018aa7675e109eb

Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." into qt-qpr1-dev

wifi/java/android/net/wifi/WifiManager.java

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 5c0be89..a2aadb5 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -3215,6 +3215,7 @@
 
         private final CloseGuard mCloseGuard = CloseGuard.get();
         private final WifiConfiguration mConfig;
+        private boolean mClosed = false;
 
         /** @hide */
         @VisibleForTesting
@@ -3230,8 +3231,13 @@
         @Override
         public void close() {
             try {
-                stopLocalOnlyHotspot();
-                mCloseGuard.close();
+                synchronized (mLock) {
+                    if (!mClosed) {
+                        mClosed = true;
+                        stopLocalOnlyHotspot();
+                        mCloseGuard.close();
+                    }
+                }
             } catch (Exception e) {
                 Log.e(TAG, "Failed to stop Local Only Hotspot.");
             }