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

Commit 4c335571 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Revert "PhoneAccountRegistrarTest: use registrar as SYSTEM user" 

This reverts commit 325aed4a.

Reason for revert: https://buganizer.corp.google.com/issues/383423749#comment7

Change-Id: I2e9d5422f941b90e01036ba570c7c3c6f5f4a472
parent 325aed4a

tests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java

+3 −4
Original line number Diff line number Diff line
@@ -113,8 +113,7 @@ 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 = UserHandle.of(10);

    private final UserHandle USER_HANDLE_1000 = UserHandle.of(1000);

    private final UserHandle USER_HANDLE_10 = new UserHandle(10);

    private final TelecomSystem.SyncRoot mLock = new TelecomSystem.SyncRoot() { };

    private PhoneAccountRegistrar mRegistrar;

    @Mock private SubscriptionManager mSubscriptionManager;
@@ -141,7 +140,6 @@ 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);
@@ -1308,7 +1306,8 @@ public class PhoneAccountRegistrarTest extends TelecomTestCase { 
                Mockito.mock(IConnectionService.class));

        UserManager userManager = mContext.getSystemService(UserManager.class);



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

        List<UserHandle> users = Arrays.asList(new UserHandle(0),

                new UserHandle(1000));



        PhoneAccount pa1 = new PhoneAccount.Builder(

                new PhoneAccountHandle(new ComponentName(PACKAGE_1, COMPONENT_NAME), "1234",