Merge "Revert "Allow network providers to set yield to bad wifi"" into sc-dev
This commit is contained in:
@@ -108,10 +108,9 @@ public class FullScore {
|
|||||||
// and all bits managed by FullScore unset. As bits are handled from 0 up in NetworkScore and
|
// and all bits managed by FullScore unset. As bits are handled from 0 up in NetworkScore and
|
||||||
// from 63 down in FullScore, cut at the 32nd bit for simplicity, but change this if some day
|
// from 63 down in FullScore, cut at the 32nd bit for simplicity, but change this if some day
|
||||||
// there are more than 32 bits handled on either side.
|
// there are more than 32 bits handled on either side.
|
||||||
// YIELD_TO_BAD_WIFI is temporarily handled by ConnectivityService, but the factory is still
|
// YIELD_TO_BAD_WIFI is temporarily handled by ConnectivityService.
|
||||||
// allowed to set it, so that it's possible to transition from handling it in CS to handling
|
private static final long EXTERNAL_POLICIES_MASK =
|
||||||
// it in the factory.
|
0x00000000FFFFFFFFL & ~(1L << POLICY_YIELD_TO_BAD_WIFI);
|
||||||
private static final long EXTERNAL_POLICIES_MASK = 0x00000000FFFFFFFFL;
|
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
static @NonNull String policyNameOf(final int policy) {
|
static @NonNull String policyNameOf(final int policy) {
|
||||||
|
|||||||
Reference in New Issue
Block a user