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

Commit 666894be authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Remove legacy resources fallback from Connectivity" into sc-dev am:... 

Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: 0dad48e0 am: 7ff09783 am: dfbd29f8

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

Change-Id: I94eb5600dd70fb6f28926f161b7d8d1973acfa5c
parents c0879119 dfbd29f8

packages/Connectivity/service/src/com/android/server/ConnectivityService.java

+1 −14
Original line number Diff line number Diff line
@@ -1497,12 +1497,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                ConnectivitySettingsManager.WIFI_ALWAYS_REQUESTED, false /* defaultValue */);

        final boolean vehicleAlwaysRequested = mResources.get().getBoolean(

                R.bool.config_vehicleInternalNetworkAlwaysRequested);

        // TODO (b/183076074): remove legacy fallback after migrating overlays

        final boolean legacyAlwaysRequested = mContext.getResources().getBoolean(

                mContext.getResources().getIdentifier(

                        "config_vehicleInternalNetworkAlwaysRequested", "bool", "android"));

        handleAlwaysOnNetworkRequest(mDefaultVehicleRequest,

                vehicleAlwaysRequested || legacyAlwaysRequested);

        handleAlwaysOnNetworkRequest(mDefaultVehicleRequest, vehicleAlwaysRequested);

    }



    private void registerSettingsCallbacks() {
@@ -6823,14 +6818,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        int mark = mResources.get().getInteger(R.integer.config_networkWakeupPacketMark);

        int mask = mResources.get().getInteger(R.integer.config_networkWakeupPacketMask);



        // TODO (b/183076074): remove legacy fallback after migrating overlays

        final int legacyMark = mContext.getResources().getInteger(mContext.getResources()

                .getIdentifier("config_networkWakeupPacketMark", "integer", "android"));

        final int legacyMask = mContext.getResources().getInteger(mContext.getResources()

                .getIdentifier("config_networkWakeupPacketMask", "integer", "android"));

        mark = mark == 0 ? legacyMark : mark;

        mask = mask == 0 ? legacyMask : mask;



        // Mask/mark of zero will not detect anything interesting.

        // Don't install rules unless both values are nonzero.

        if (mark == 0 || mask == 0) {

packages/Connectivity/service/src/com/android/server/connectivity/KeepaliveTracker.java

+4 −11
Original line number Diff line number Diff line
@@ -114,18 +114,11 @@ public class KeepaliveTracker { 
        mContext = context;

        mSupportedKeepalives = KeepaliveUtils.getSupportedKeepalives(mContext);



        // TODO (b/183076074): stop reading legacy resources after migrating overlays

        final int legacyReservedSlots = mContext.getResources().getInteger(

                mContext.getResources().getIdentifier(

                        "config_reservedPrivilegedKeepaliveSlots", "integer", "android"));

        final int legacyAllowedSlots = mContext.getResources().getInteger(

                mContext.getResources().getIdentifier(

                        "config_allowedUnprivilegedKeepalivePerUid", "integer", "android"));

        final ConnectivityResources res = new ConnectivityResources(mContext);

        mReservedPrivilegedSlots = Math.min(legacyReservedSlots, res.get().getInteger(

                R.integer.config_reservedPrivilegedKeepaliveSlots));

        mAllowedUnprivilegedSlotsForUid = Math.min(legacyAllowedSlots, res.get().getInteger(

                R.integer.config_allowedUnprivilegedKeepalivePerUid));

        mReservedPrivilegedSlots = res.get().getInteger(

                R.integer.config_reservedPrivilegedKeepaliveSlots);

        mAllowedUnprivilegedSlotsForUid = res.get().getInteger(

                R.integer.config_allowedUnprivilegedKeepalivePerUid);

    }



    /**