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

Commit 161814ff authored by Mark Chien's avatar Mark Chien Committed by Gerrit Code Review
Browse files

Merge "Don't allow upstream if entitlement don't know any downstream"

parents 3e85da2d 426311bc

services/core/java/com/android/server/connectivity/tethering/EntitlementManager.java

+6 −0
Original line number Diff line number Diff line
@@ -161,6 +161,12 @@ public class EntitlementManager { 
     * Check if cellular upstream is permitted.

     */

    public boolean isCellularUpstreamPermitted() {

        // If provisioning is required and EntitlementManager don't know any downstream,

        // cellular upstream should not be allowed.

        final TetheringConfiguration config = mFetcher.fetchTetheringConfiguration();

        if (mCurrentTethers.size() == 0 && isTetherProvisioningRequired(config)) {

            return false;

        }

        return mCellularUpstreamPermitted;

    }

tests/net/java/com/android/server/connectivity/tethering/EntitlementManagerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -405,6 +405,13 @@ public final class EntitlementManagerTest { 


    }



    @Test

    public void verifyPermissionWhenProvisioningNotStarted() {

        assertTrue(mEnMgr.isCellularUpstreamPermitted());

        setupForRequiredProvisioning();

        assertFalse(mEnMgr.isCellularUpstreamPermitted());

    }



    @Test

    public void testRunTetherProvisioning() {

        setupForRequiredProvisioning();