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

Commit af6e87f5 authored by Varun Berry's avatar Varun Berry
Browse files

SimCallManager can access #getDefaultOutgoingPhoneAccount. 

This change allows the sim call manager to access the default outgoing
phone account. This is required to allow the sim call manager to register
incoming calls with the platform without requiring the READ_PHONE_STATE
permission.

Bug: 148111849
Test: TelecomServiceImplTest.java
Merged-In: I4d9a87dab2759d916f8a1bba5f8e4a654d5185e5
Change-Id: I4d9a87dab2759d916f8a1bba5f8e4a654d5185e5
(cherry picked from commit d2d02a35)
parent 325c5386

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

+10 −6
Original line number Diff line number Diff line
@@ -112,15 +112,11 @@ public class TelecomServiceImpl { 
            try {

                Log.startSession("TSI.gDOPA");

                synchronized (mLock) {

                    if (!canReadPhoneState(callingPackage, callingFeatureId,

                            "getDefaultOutgoingPhoneAccount")) {

                        return null;

                    }



                    PhoneAccountHandle phoneAccountHandle = null;

                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar

                        phoneAccountHandle = mPhoneAccountRegistrar

                                .getOutgoingPhoneAccountForScheme(uriScheme, callingUserHandle);

                    } catch (Exception e) {

                        Log.e(this, e, "getDefaultOutgoingPhoneAccount");
@@ -128,6 +124,14 @@ public class TelecomServiceImpl { 
                    } finally {

                        Binder.restoreCallingIdentity(token);

                    }

                    if (isCallerSimCallManager(phoneAccountHandle)

                        || canReadPhoneState(

                            callingPackage,

                            callingFeatureId,

                            "getDefaultOutgoingPhoneAccount")) {

                      return phoneAccountHandle;

                    }

                    return null;

                }

            } finally {

                Log.endSession();

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

+44 −0
Original line number Diff line number Diff line
@@ -248,6 +248,43 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
                .getOutgoingPhoneAccountForScheme(eq("sip"), any(UserHandle.class)))

                .thenReturn(SIP_PA_HANDLE_17);

        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);

        PhoneAccount phoneAccount = makePhoneAccount(TEL_PA_HANDLE_CURRENT).build();

        phoneAccount.setIsEnabled(true);

        doReturn(phoneAccount).when(mFakePhoneAccountRegistrar).getPhoneAccount(

                eq(TEL_PA_HANDLE_CURRENT), any(UserHandle.class));

        doNothing().when(mAppOpsManager).checkPackage(anyInt(), anyString());



        PhoneAccountHandle returnedHandleTel

                = mTSIBinder.getDefaultOutgoingPhoneAccount("tel", DEFAULT_DIALER_PACKAGE, null);

        assertEquals(TEL_PA_HANDLE_16, returnedHandleTel);



        PhoneAccountHandle returnedHandleSip

                = mTSIBinder.getDefaultOutgoingPhoneAccount("sip", DEFAULT_DIALER_PACKAGE, null);

        assertEquals(SIP_PA_HANDLE_17, returnedHandleSip);

    }



    @SmallTest

    @Test

    public void testGetDefaultOutgoingPhoneAccountSucceedsIfCallerIsSimCallManager()

            throws RemoteException {

        when(mFakePhoneAccountRegistrar

                .getOutgoingPhoneAccountForScheme(eq("tel"), any(UserHandle.class)))

                .thenReturn(TEL_PA_HANDLE_16);

        when(mFakePhoneAccountRegistrar

                .getOutgoingPhoneAccountForScheme(eq("sip"), any(UserHandle.class)))

                .thenReturn(SIP_PA_HANDLE_17);

        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);

        PhoneAccount phoneAccount = makePhoneAccount(TEL_PA_HANDLE_CURRENT).build();

        phoneAccount.setIsEnabled(true);

        doReturn(phoneAccount).when(mFakePhoneAccountRegistrar).getPhoneAccount(

                eq(TEL_PA_HANDLE_CURRENT), any(UserHandle.class));

        doReturn(TEL_PA_HANDLE_CURRENT).when(mFakePhoneAccountRegistrar)

                .getSimCallManagerFromHandle(

                eq(TEL_PA_HANDLE_CURRENT), any(UserHandle.class));

        // doNothing will make #isCallerSimCallManager return true

        doNothing().when(mAppOpsManager).checkPackage(anyInt(), anyString());

        doThrow(new SecurityException()).when(mContext)

                .enforceCallingOrSelfPermission(eq(READ_PRIVILEGED_PHONE_STATE), anyString());



        PhoneAccountHandle returnedHandleTel

                = mTSIBinder.getDefaultOutgoingPhoneAccount("tel", DEFAULT_DIALER_PACKAGE, null);
@@ -272,6 +309,13 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_READ_PHONE_STATE), anyInt(), anyString(),

                nullable(String.class), nullable(String.class)))

                .thenReturn(AppOpsManager.MODE_IGNORED);

        PhoneAccount phoneAccount = makePhoneAccount(TEL_PA_HANDLE_CURRENT).build();

        phoneAccount.setIsEnabled(true);

        doReturn(phoneAccount).when(mFakePhoneAccountRegistrar).getPhoneAccount(

                eq(TEL_PA_HANDLE_CURRENT), any(UserHandle.class));

        doReturn(TEL_PA_HANDLE_16).when(mFakePhoneAccountRegistrar).getSimCallManagerFromHandle(

                eq(TEL_PA_HANDLE_CURRENT), any(UserHandle.class));

        doNothing().when(mAppOpsManager).checkPackage(anyInt(), anyString());

        doThrow(new SecurityException()).when(mContext)

                .enforceCallingOrSelfPermission(eq(READ_PRIVILEGED_PHONE_STATE), anyString());