Merge "wifi settings: Fix incorrect maximum compativibility toggle behavior" into sc-dev am: a586dc3a96

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124309

Change-Id: I427fcf75c1a0d820e5f6a59871338a2d5f418ed0
This commit is contained in:
TreeHugger Robot
2021-04-09 05:12:23 +00:00
committed by Automerger Merge Worker
2 changed files with 10 additions and 10 deletions

View File

@@ -99,10 +99,10 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends
}
// If the BridgedAp Concurrency is not supported in early Pixel devices (e.g. Pixel 2~5),
// show toggle on if the band includes SoftApConfiguration.BAND_5GHZ.
// show toggle on when band is 2.4G only.
final int band = config.getBand();
Log.d(TAG, "getBand:" + band);
return (band & SoftApConfiguration.BAND_5GHZ) > 0;
return band == SoftApConfiguration.BAND_2GHZ;
}
/**
@@ -128,8 +128,8 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends
builder.setBridgedModeOpportunisticShutdownEnabled(!enabled);
} else {
int band = enabled
? SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ
: SoftApConfiguration.BAND_2GHZ;
? SoftApConfiguration.BAND_2GHZ
: SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ;
Log.d(TAG, "setBand:" + band);
builder.setBand(band);
}