summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/qs
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-12-16 15:44:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-16 15:44:07 +0000
commit052e9b12f5fc7a1e3ecdd126ca8c07298941f291 (patch)
treeccc32f7644271cf1eed362219ceba0dfe396a954 /packages/SystemUI/src/com/android/systemui/qs
parent48f9c8e48c5d765afc025c2bda3695d0dd13388e (diff)
parente69e5f87b3227bddc1315234218717ba3e8439c1 (diff)
downloadframeworks_base-052e9b12f5fc7a1e3ecdd126ca8c07298941f291.zip
frameworks_base-052e9b12f5fc7a1e3ecdd126ca8c07298941f291.tar.gz
frameworks_base-052e9b12f5fc7a1e3ecdd126ca8c07298941f291.tar.bz2
Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
index 6e710ef..fcc517f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -88,9 +88,7 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
@Override
protected void handleUpdateState(BooleanState state, Object arg) {
- state.visible = mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed()
- && !(mController.isProvisioningNeeded() && mKeyguard.isSecure()
- && mKeyguard.isShowing());
+ state.visible = mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed();
state.label = mContext.getString(R.string.quick_settings_hotspot_label);
state.value = mController.isHotspotEnabled();