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

am: be99e9e60d Change-Id: I22b33064a6ab2b6507fa71ce94190eb85d2de4ba
2018-04-23 17:31:40 -07:00
parent bd41ceda0b be99e9e60d
commit b9e1d6f961
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.