Merge "Disable hotspot when data saver is on." into pi-dev am: be99e9e60d

am: b9e1d6f961 Change-Id: I49d651b87e332aab5fabf5b5ae684f726b26278b
2018-04-23 17:41:57 -07:00
parent 7f12b45892 b9e1d6f961
commit c3f202bef8
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -98,7 +98,8 @@ public class HotspotTile extends QSTileImpl<AirplaneBooleanState> {
    @Override
    protected void handleClick() {
        final boolean isEnabled = mState.value;
-        if (!isEnabled && mAirplaneMode.getValue() != 0) {
+        if (!isEnabled &&
+                (mAirplaneMode.getValue() != 0 || mDataSaverController.isDataSaverEnabled())) {
            return;
        }
        // Immediately enter transient enabling state when turning hotspot on.