Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156a7f99 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Allow network providers to set yield to bad wifi" into sc-dev am: 0d88f806

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14439508

Change-Id: I24a03f7ebedf1915cb87d6f352d99f6c9f0e8d1d
parents 252deb4b 0d88f806
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -108,9 +108,10 @@ public class FullScore {
    // 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
    // there are more than 32 bits handled on either side.
    // YIELD_TO_BAD_WIFI is temporarily handled by ConnectivityService.
    private static final long EXTERNAL_POLICIES_MASK =
            0x00000000FFFFFFFFL & ~(1L << POLICY_YIELD_TO_BAD_WIFI);
    // YIELD_TO_BAD_WIFI is temporarily handled by ConnectivityService, but the factory is still
    // allowed to set it, so that it's possible to transition from handling it in CS to handling
    // it in the factory.
    private static final long EXTERNAL_POLICIES_MASK = 0x00000000FFFFFFFFL;

    @VisibleForTesting
    static @NonNull String policyNameOf(final int policy) {