Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1 am: 538bc0fe4f am: 5d2bb5b544

am: 4fbf46cdc5

Change-Id: If75db66e9e24d802b01267d1e7686d7261138be6

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

@@ -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

@@ -405,6 +405,13 @@ public final class EntitlementManagerTest {
 
     }
 
+    @Test
+    public void verifyPermissionWhenProvisioningNotStarted() {
+        assertTrue(mEnMgr.isCellularUpstreamPermitted());
+        setupForRequiredProvisioning();
+        assertFalse(mEnMgr.isCellularUpstreamPermitted());
+    }
+
     @Test
     public void testRunTetherProvisioning() {
         setupForRequiredProvisioning();