From d967f8210c2a9d969ace3e7c1e4ef8595ceb97b1 Mon Sep 17 00:00:00 2001
From: Amin Shaikh <ashaikh@google.com>
Date: Tue, 19 Jun 2018 17:58:35 -0400
Subject: Do not restart tethering while enabling tethering.

Change-Id: I64194cfbcf830d867593681ab960fea0213ef24a
Fixes: 110303540
Test: manual
(cherry picked from commit aa4735f69c2009128fe38823040a2037ebe577c5)
---
 .../com/android/systemui/statusbar/policy/HotspotControllerImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
index d6d0673e2c0b..3c16329e6f19 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
@@ -134,6 +134,10 @@ public class HotspotControllerImpl implements HotspotController, WifiManager.Sof
 
     @Override
     public void setHotspotEnabled(boolean enabled) {
+        if (mWaitingForCallback) {
+            if (DEBUG) Log.d(TAG, "Ignoring setHotspotEnabled; waiting for callback.");
+            return;
+        }
         if (enabled) {
             OnStartTetheringCallback callback = new OnStartTetheringCallback();
             mWaitingForCallback = true;
-- 
cgit v1.2.3-59-g8ed1b