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

Commit 1555979d authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Automerger Merge Worker
Browse files

Resolve MT Work Profile ECall am: 01ee614f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23755863



Change-Id: I83ac7dae958debf3e0e68f58cf5b0e88853dd0f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 009ef191 01ee614f

src/com/android/server/telecom/CallsManager.java

+8 −1
Original line number Diff line number Diff line
@@ -1572,7 +1572,14 @@ public class CallsManager extends Call.ListenerBase 
        // Check if the target phone account is possibly in ECBM.

        call.setIsInECBM(getEmergencyCallHelper()

                .isLastOutgoingEmergencyCallPAH(call.getTargetPhoneAccount()));

        if (mUserManager.isQuietModeEnabled(call.getAssociatedUser())

        // If the phone account user profile is paused or the call isn't visible to the secondary/

        // guest user, reject the non-emergency incoming call. When the current user is the admin,

        // we need to allow the calls to go through if the work profile isn't paused. We should

        // always allow emergency calls and also allow non-emergency calls when ECBM is active for

        // the phone account.

        if ((mUserManager.isQuietModeEnabled(call.getAssociatedUser())

                || (!mUserManager.isUserAdmin(mCurrentUserHandle.getIdentifier())

                && !isCallVisibleForUser(call, mCurrentUserHandle)))

                && !call.isEmergencyCall() && !call.isInECBM()) {

            Log.d(TAG, "Rejecting non-emergency call because the owner %s is not running.",

                    phoneAccountHandle.getUserHandle());

src/com/android/server/telecom/InCallController.java

+5 −1
Original line number Diff line number Diff line
@@ -2875,7 +2875,11 @@ public class InCallController extends CallsManagerListenerBase implements 
            // Emergency call should never be blocked, so if the user associated with call is in

            // quite mode, use the primary user for the emergency call.

            if ((call.isEmergencyCall() || call.isInECBM())

                    && userManager.isQuietModeEnabled(userFromCall)) {

                    && (userManager.isQuietModeEnabled(userFromCall)

                    // We should also account for secondary/guest users where the profile may not

                    // necessarily be paused.

                    || !userManager.isUserAdmin(mCallsManager.getCurrentUserHandle()

                    .getIdentifier()))) {

                return mCallsManager.getCurrentUserHandle();

            }

            return userFromCall;

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

+63 −1
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ public class CallsManagerTest extends TelecomTestCase { 
            ComponentName.unflattenFromString("com.baz/.Self"), "Self");

    private static final PhoneAccountHandle SELF_MANAGED_2_HANDLE = new PhoneAccountHandle(

            ComponentName.unflattenFromString("com.baz/.Self2"), "Self2");

    private static final PhoneAccountHandle WORK_HANDLE = new PhoneAccountHandle(

            ComponentName.unflattenFromString("com.foo/.Blah"), "work", new UserHandle(10));

    private static final PhoneAccountHandle SELF_MANAGED_W_CUSTOM_HANDLE = new PhoneAccountHandle(

            new ComponentName(TEST_PACKAGE_NAME, "class"), "1", TEST_USER_HANDLE);

    private static final PhoneAccount SIM_1_ACCOUNT = new PhoneAccount.Builder(SIM_1_HANDLE, "Sim1")
@@ -205,11 +207,19 @@ public class CallsManagerTest extends TelecomTestCase { 
            .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)

            .setIsEnabled(true)

            .build();

    private static final PhoneAccount WORK_ACCOUNT = new PhoneAccount.Builder(

            WORK_HANDLE, "work")

            .setCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION

                    | PhoneAccount.CAPABILITY_CALL_PROVIDER

                    | PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS)

            .setIsEnabled(true)

            .build();

    private static final PhoneAccount SM_W_DIFFERENT_PACKAGE_AND_USER = new PhoneAccount.Builder(

            SELF_MANAGED_W_CUSTOM_HANDLE, "Self")

            .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)

            .setIsEnabled(true)

            .build();



    private static final Uri TEST_ADDRESS = Uri.parse("tel:555-1212");

    private static final Uri TEST_ADDRESS2 = Uri.parse("tel:555-1213");

    private static final Uri TEST_ADDRESS3 = Uri.parse("tel:555-1214");
@@ -346,6 +356,8 @@ public class CallsManagerTest extends TelecomTestCase { 
                eq(SIM_1_HANDLE), any())).thenReturn(SIM_1_ACCOUNT);

        when(mPhoneAccountRegistrar.getPhoneAccount(

                eq(SIM_2_HANDLE), any())).thenReturn(SIM_2_ACCOUNT);

        when(mPhoneAccountRegistrar.getPhoneAccount(

                eq(WORK_HANDLE), any())).thenReturn(WORK_ACCOUNT);

        when(mToastFactory.makeText(any(), anyInt(), anyInt())).thenReturn(mToast);

        when(mToastFactory.makeText(any(), any(), anyInt())).thenReturn(mToast);

    }
@@ -2490,7 +2502,30 @@ public class CallsManagerTest extends TelecomTestCase { 


    @SmallTest

    @Test

    public void testRejectIncomingCallOnPAHInactive() throws Exception {

    public void testRejectIncomingCallOnPAHInactive_SecondaryUser() throws Exception {

        ConnectionServiceWrapper service = mock(ConnectionServiceWrapper.class);

        doReturn(WORK_HANDLE.getComponentName()).when(service).getComponentName();

        mCallsManager.addConnectionServiceRepositoryCache(WORK_HANDLE.getComponentName(),

                WORK_HANDLE.getUserHandle(), service);



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

        UserHandle newUser = new UserHandle(11);

        when(mCallsManager.getCurrentUserHandle()).thenReturn(newUser);

        when(um.isUserAdmin(eq(newUser.getIdentifier()))).thenReturn(false);

        when(um.isQuietModeEnabled(eq(WORK_HANDLE.getUserHandle()))).thenReturn(false);

        when(mPhoneAccountRegistrar.getPhoneAccountUnchecked(eq(WORK_HANDLE)))

                .thenReturn(WORK_ACCOUNT);

        Call newCall = mCallsManager.processIncomingCallIntent(

                WORK_HANDLE, new Bundle(), false);



        verify(service, timeout(TEST_TIMEOUT)).createConnectionFailed(any());

        assertFalse(newCall.isInECBM());

        assertEquals(USER_MISSED_NOT_RUNNING, newCall.getMissedReason());

    }



    @SmallTest

    @Test

    public void testRejectIncomingCallOnPAHInactive_ProfilePaused() throws Exception {

        ConnectionServiceWrapper service = mock(ConnectionServiceWrapper.class);

        doReturn(SIM_2_HANDLE.getComponentName()).when(service).getComponentName();

        mCallsManager.addConnectionServiceRepositoryCache(SIM_2_HANDLE.getComponentName(),
@@ -2525,6 +2560,30 @@ public class CallsManagerTest extends TelecomTestCase { 
        verify(service, timeout(TEST_TIMEOUT).times(0)).createConnectionFailed(any());

    }



    @SmallTest

    @Test

    public void testAcceptIncomingCallOnPAHInactiveAndECBMActive_SecondaryUser() throws Exception {

        ConnectionServiceWrapper service = mock(ConnectionServiceWrapper.class);

        doReturn(WORK_HANDLE.getComponentName()).when(service).getComponentName();

        mCallsManager.addConnectionServiceRepositoryCache(SIM_2_HANDLE.getComponentName(),

                WORK_HANDLE.getUserHandle(), service);



        when(mEmergencyCallHelper.isLastOutgoingEmergencyCallPAH(eq(WORK_HANDLE)))

                .thenReturn(true);

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

        UserHandle newUser = new UserHandle(11);

        when(mCallsManager.getCurrentUserHandle()).thenReturn(newUser);

        when(um.isUserAdmin(eq(newUser.getIdentifier()))).thenReturn(false);

        when(um.isQuietModeEnabled(eq(WORK_HANDLE.getUserHandle()))).thenReturn(false);

        when(mPhoneAccountRegistrar.getPhoneAccountUnchecked(eq(WORK_HANDLE)))

                .thenReturn(WORK_ACCOUNT);

        Call newCall = mCallsManager.processIncomingCallIntent(

                WORK_HANDLE, new Bundle(), false);



        assertTrue(newCall.isInECBM());

        verify(service, timeout(TEST_TIMEOUT).times(0)).createConnectionFailed(any());

    }



    @SmallTest

    @Test

    public void testAcceptIncomingEmergencyCallOnPAHInactive() throws Exception {
@@ -3100,6 +3159,9 @@ public class CallsManagerTest extends TelecomTestCase { 
        // WHEN

        when(mPhoneAccountRegistrar.getPhoneAccountUnchecked(any()))

                .thenReturn(SM_W_DIFFERENT_PACKAGE_AND_USER);

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

        when(um.isUserAdmin(eq(mCallsManager.getCurrentUserHandle().getIdentifier())))

                .thenReturn(true);



        // THEN

        mCallsManager.processIncomingCallIntent(SELF_MANAGED_W_CUSTOM_HANDLE, new Bundle(), false);

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

+32 −0
Original line number Diff line number Diff line
@@ -635,6 +635,37 @@ public class InCallControllerTests extends TelecomTestCase { 
        assertEquals(InCallService.SERVICE_INTERFACE, bindIntent.getAction());

    }



    @MediumTest

    @Test

    public void

    testBindToService_UserAssociatedWithCallSecondary_NonEmergCallECBM_BindsToSecondaryUser()

            throws Exception {

        UserHandle newUser = new UserHandle(13);

        when(mMockCallsManager.getCurrentUserHandle()).thenReturn(newUser);

        when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager);

        when(mMockCall.isEmergencyCall()).thenReturn(false);

        when(mMockCall.isInECBM()).thenReturn(true);

        when(mMockCall.isIncoming()).thenReturn(true);

        when(mMockCall.getAssociatedUser()).thenReturn(DUMMY_USER_HANDLE);

        when(mMockContext.getSystemService(eq(UserManager.class)))

                .thenReturn(mMockUserManager);

        when(mMockUserManager.isQuietModeEnabled(any(UserHandle.class))).thenReturn(false);

        when(mMockUserManager.isUserAdmin(anyInt())).thenReturn(false);

        setupMockPackageManager(true /* default */, true /* system */, false /* external calls */);

        setupMockPackageManagerLocationPermission(SYS_PKG, false /* granted */);



        mInCallController.bindToServices(mMockCall);



        ArgumentCaptor<Intent> bindIntentCaptor = ArgumentCaptor.forClass(Intent.class);

        verify(mMockContext, times(1)).bindServiceAsUser(

                bindIntentCaptor.capture(),

                any(ServiceConnection.class),

                eq(serviceBindingFlags),

                eq(newUser));

        Intent bindIntent = bindIntentCaptor.getValue();

        assertEquals(InCallService.SERVICE_INTERFACE, bindIntent.getAction());

    }



    @MediumTest

    @Test

    public void
@@ -647,6 +678,7 @@ public class InCallControllerTests extends TelecomTestCase { 
        when(mMockContext.getSystemService(eq(UserManager.class)))

            .thenReturn(mMockUserManager);

        when(mMockUserManager.isQuietModeEnabled(any(UserHandle.class))).thenReturn(false);

        when(mMockUserManager.isUserAdmin(anyInt())).thenReturn(true);

        setupMockPackageManager(true /* default */, true /* system */, false /* external calls */);

        setupMockPackageManagerLocationPermission(SYS_PKG, false /* granted */);