Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." am: c046f9f039 am: aa562f6dc3 (d0ba20f1) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3214,6 +3214,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
	@@ -3229,8 +3230,13 @@ public class WifiManager {
	@Override		@Override
	public void close() {		public void close() {
	try {		try {
			synchronized (mLock) {
			if (!mClosed) {
			mClosed = true;
	stopLocalOnlyHotspot();		stopLocalOnlyHotspot();
	mCloseGuard.close();		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.");
	}		}