From 50eac3573a952f5723b6564ed51dd7118576d78c Mon Sep 17 00:00:00 2001
From: Yoshinori Hirano <yoshinori.hirano@sonymobile.com>
Date: Fri, 26 May 2017 11:53:34 +0900
Subject: [PATCH] Hide Wi-Fi activity indicator when Wi-Fi icon is hidden

Wi-Fi icon in the status bar can be blocked by System UI Tuner.
So the activity indicator should be hidden.

Fixes: 62211154
Test: manual - block Wi-Fi icon

Author: Akira Oshimi <akira.oshimi@sony.com>
Change-Id: Iba698d621d60f6d6c9f6d8205f91df49806f3f54
---
 .../src/com/android/systemui/statusbar/SignalClusterView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
index 28a858c066ce7..6d2a023652228 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
@@ -292,8 +292,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController
         mWifiStrengthId = statusIcon.icon;
         mWifiBadgeId = statusIcon.iconOverlay;
         mWifiDescription = statusIcon.contentDescription;
-        mWifiIn = activityIn && mActivityEnabled;
-        mWifiOut = activityOut && mActivityEnabled;
+        mWifiIn = activityIn && mActivityEnabled && mWifiVisible;
+        mWifiOut = activityOut && mActivityEnabled && mWifiVisible;
 
         apply();
     }