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

Merge "Disable multi-user check for entitlement provisioning" into main

Browse source
This commit is contained in:
Junyu Lai 2024-12-09 04:22:34 +00:00 • committed by Gerrit Code Review
commit 642f418c59
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,7 +154,9 @@ public class EntitlementManager {
// Only launch entitlement UI for the current user if it is allowed to
// change tethering. This usually means the system user or the admin users in HSUM.
if (SdkLevel.isAtLeastT()) {
// TODO (b/382624069): Figure out whether it is safe to call createContextAsUser
// from secondary user. And re-enable the check or remove the code accordingly.
if (false) {
// Create a user context for the current foreground user as UserManager#isAdmin()
// operates on the context user.
final int currentUserId = getCurrentUser();

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

@ -38,7 +38,6 @@ import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
import static com.android.networkstack.apishim.ConstantsShim.KEY_CARRIER_SUPPORTS_TETHERING_BOOL;
import static com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
import static com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
@ -592,16 +591,8 @@ public final class EntitlementManagerTest {
.onTetherProvisioningFailed(TETHERING_WIFI, FAILED_TETHERING_REASON);
}
@IgnoreUpTo(SC_V2)
@Test
public void testUiProvisioningMultiUser_aboveT() {
doTestUiProvisioningMultiUser(true, 1);
doTestUiProvisioningMultiUser(false, 0);
}
@IgnoreAfter(SC_V2)
@Test
public void testUiProvisioningMultiUser_belowT() {
public void testUiProvisioningMultiUser() {
doTestUiProvisioningMultiUser(true, 1);
doTestUiProvisioningMultiUser(false, 1);
}