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

Commit ece7b213 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Expose getUserSelectedOutgoingPhoneAccount for priv app or dialer. am: 58a0a514 

am: 63f55179

Change-Id: I56b8b0bf86abb164ba77948f70f410c69b1f5fe4
parents 021f06b6 63f55179

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

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ public class PhoneAccountRegistrar { 
                int subId = getSubscriptionIdForPhoneAccount(accountHandle);

                mSubscriptionManager.setDefaultVoiceSubId(subId);

            }



            Log.i(this, "setUserSelectedOutgoingPhoneAccount: %s", accountHandle);

            mState.defaultOutgoingAccountHandles

                    .put(userHandle, new DefaultPhoneAccountHandle(userHandle, accountHandle,

                            account.getGroupId()));

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

+18 −1
Original line number Diff line number Diff line
@@ -137,10 +137,14 @@ public class TelecomServiceImpl { 
        }



        @Override

        public PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() {

        public PhoneAccountHandle getUserSelectedOutgoingPhoneAccount(String callingPackage) {

            synchronized (mLock) {

                try {

                    Log.startSession("TSI.gUSOPA");

                    if (!isDialerOrPrivileged(callingPackage, "getDefaultOutgoingPhoneAccount")) {

                        throw new SecurityException("Only the default dialer, or caller with "

                                + "READ_PRIVILEGED_PHONE_STATE can call this method.");

                    }

                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    return mPhoneAccountRegistrar.getUserSelectedOutgoingPhoneAccount(

                            callingUserHandle);
@@ -1909,6 +1913,19 @@ public class TelecomServiceImpl { 
        }

    }



    private boolean isDialerOrPrivileged(String callingPackage, String message) {

        // The system/default dialer can always read phone state - so that emergency calls will

        // still work.

        if (isPrivilegedDialerCalling(callingPackage)) {

            return true;

        }



        mContext.enforceCallingOrSelfPermission(READ_PRIVILEGED_PHONE_STATE, message);

        // SKIP checking run-time OP_READ_PHONE_STATE since caller or self has PRIVILEGED

        // permission

        return true;

    }



    private boolean isSelfManagedConnectionService(PhoneAccountHandle phoneAccountHandle) {

        if (phoneAccountHandle != null) {

                PhoneAccount phoneAccount = mPhoneAccountRegistrar.getPhoneAccountUnchecked(

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

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import static android.Manifest.permission.MODIFY_PHONE_STATE; 
import static android.Manifest.permission.READ_PHONE_STATE;

import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;



import android.annotation.MainThread;

import android.annotation.WorkerThread;

import android.app.ActivityManager;

import android.app.AppOpsManager;

import android.content.ComponentName;
@@ -271,7 +273,8 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
                makeMultiUserPhoneAccount(TEL_PA_HANDLE_16).build());



        PhoneAccountHandle returnedHandle

                = mTSIBinder.getUserSelectedOutgoingPhoneAccount();

                = mTSIBinder.getUserSelectedOutgoingPhoneAccount(

                        TEL_PA_HANDLE_16.getComponentName().getPackageName());

        assertEquals(TEL_PA_HANDLE_16, returnedHandle);

    }