joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Stop tethering when the current user is not allowed to do entitlement check

Browse source 
This commit ensures that EntitlementManager sends the appropriate
error code to the receiver when the current user is not allowed
to perform entitlement check. This error code also listened by
the tethering module, where it would stop tethering when receiving
such error code.

Test: atest TetheringTests:EntitlementManagerTest
Bug: 376792293
Change-Id: I2dd18f9df9ad7cab542f8877b9fc86600c248144
This commit is contained in:
Junyu Lai 2024-11-20 10:20:53 +08:00
commit 0adbb0277b
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Tethering/src/com/android/networkstack/tethering/EntitlementManager.java
View file

@ -167,6 +167,11 @@ public class EntitlementManager {
} else {
mLog.e("Current user (" + currentUserId
+ ") is not allowed to perform entitlement check.");
// If the user is not allowed to perform an entitlement check
// (e.g., a non-admin user), notify the receiver immediately.
// This is necessary because the entitlement check app cannot
// be launched to conduct the check and deliver the results.
receiver.send(TETHER_ERROR_PROVISIONING_FAILED, null);
return null;
}
} else {

12
Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java
View file

@ -188,8 +188,9 @@ public final class EntitlementManagerTest {
if (intent != null) {
assertUiTetherProvisioningIntent(type, config, receiver, intent);
uiProvisionCount++;
// If the intent is null, the result is sent by the underlying method.
receiver.send(fakeEntitlementResult, null);
}
receiver.send(fakeEntitlementResult, null);
return intent;
}
@ -644,6 +645,15 @@ public final class EntitlementManagerTest {
mEnMgr.startProvisioningIfNeeded(TETHERING_USB, true);
mLooper.dispatchAll();
assertEquals(expectedUiProvisionCount, mDeps.uiProvisionCount);
if (expectedUiProvisionCount == 0) { // Failed to launch entitlement UI.
assertLatestEntitlementResult(TETHERING_USB, TETHER_ERROR_PROVISIONING_FAILED, false);
verify(mTetherProvisioningFailedListener).onTetherProvisioningFailed(TETHERING_USB,
FAILED_TETHERING_REASON);
} else {
assertLatestEntitlementResult(TETHERING_USB, TETHER_ERROR_NO_ERROR, false);
verify(mTetherProvisioningFailedListener, never()).onTetherProvisioningFailed(anyInt(),
anyString());
}
}
@Test