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

Commit 325aed4a authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

PhoneAccountRegistrarTest: use registrar as SYSTEM user

Bug: 365800992
Test: atest com.android.server.telecom.tests.PhoneAccountRegistrarTest#testCleanUpOrphanAccounts
Flag: TEST_ONLY
Change-Id: Ic273aba0c975165cc058a57eb232fd0597e385d1
parent 26b000fa
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ public class PhoneAccountRegistrarTest extends TelecomTestCase {
    private final String PACKAGE_1 = "PACKAGE_1";
    private final String PACKAGE_2 = "PACKAGE_2";
    private final String COMPONENT_NAME = "com.android.server.telecom.tests.MockConnectionService";
    private final UserHandle USER_HANDLE_10 = new UserHandle(10);
    private final UserHandle USER_HANDLE_10 = UserHandle.of(10);
    private final UserHandle USER_HANDLE_1000 = UserHandle.of(1000);
    private final TelecomSystem.SyncRoot mLock = new TelecomSystem.SyncRoot() { };
    private PhoneAccountRegistrar mRegistrar;
    @Mock private SubscriptionManager mSubscriptionManager;
@@ -140,6 +141,7 @@ public class PhoneAccountRegistrarTest extends TelecomTestCase {
        mRegistrar = new PhoneAccountRegistrar(
                mComponentContextFixture.getTestDouble().getApplicationContext(), mLock, FILE_NAME,
                mDefaultDialerCache, mAppLabelProxy, mTelephonyFeatureFlags, mFeatureFlags);
        mRegistrar.setCurrentUserHandle(UserHandle.SYSTEM);
        when(mFeatureFlags.onlyUpdateTelephonyOnValidSubIds()).thenReturn(false);
        when(mFeatureFlags.unregisterUnresolvableAccounts()).thenReturn(true);
        when(mTelephonyFeatureFlags.workProfileApiSplit()).thenReturn(false);
@@ -1306,8 +1308,7 @@ public class PhoneAccountRegistrarTest extends TelecomTestCase {
                Mockito.mock(IConnectionService.class));
        UserManager userManager = mContext.getSystemService(UserManager.class);

        List<UserHandle> users = Arrays.asList(new UserHandle(0),
                new UserHandle(1000));
        List<UserHandle> users = Arrays.asList(UserHandle.SYSTEM, USER_HANDLE_1000);

        PhoneAccount pa1 = new PhoneAccount.Builder(
                new PhoneAccountHandle(new ComponentName(PACKAGE_1, COMPONENT_NAME), "1234",