Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 538bc0fe4f

Change-Id: Ibfa3dfd6a187f6926831910cbef920cf122721a1
This commit is contained in:
Mark Chien
2019-08-13 03:01:31 -07:00
committed by android-build-merger
parent 568f8bff01 538bc0fe4f
commit 5d2bb5b544
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/connectivity/tethering/EntitlementManager.java
View File

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

7
tests/net/java/com/android/server/connectivity/tethering/EntitlementManagerTest.java
View File

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