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

This commit is contained in:
TreeHugger Robot
2018-04-24 00:11:43 +00:00
committed by Android (Google) Code Review

View File

@@ -98,7 +98,8 @@ public class HotspotTile extends QSTileImpl<AirplaneBooleanState> {
@Override @Override
protected void handleClick() { protected void handleClick() {
final boolean isEnabled = mState.value; final boolean isEnabled = mState.value;
if (!isEnabled && mAirplaneMode.getValue() != 0) { if (!isEnabled &&
(mAirplaneMode.getValue() != 0 || mDataSaverController.isDataSaverEnabled())) {
return; return;
} }
// Immediately enter transient enabling state when turning hotspot on. // Immediately enter transient enabling state when turning hotspot on.