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

Unverified Commit e202f3b0 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-10.0.0_r72' of... 

Merge tag 'android-security-10.0.0_r72' of https://android.googlesource.com/platform/packages/services/Telecomm into staging/lineage-17.1_merge_android-security-10.0.0_r72

Android security 10.0.0 release 72

* tag 'android-security-10.0.0_r72' of https://android.googlesource.com/platform/packages/services/Telecomm:
  DO NOT MERGE Fix security vulnerability issue for multi user call redirections.
  switch TelecomManager List getters to ParceledListSlice

Change-Id: I9f3b5fc4c10398faff419921d05b4fc835ea75a5
parents 72af4ca2 6daaa892

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

100644 → 100755
+15 −5
Original line number Diff line number Diff line
@@ -1727,8 +1727,17 @@ public class CallsManager extends Call.ListenerBase 


        boolean endEarly = false;

        String disconnectReason = "";



        String callRedirectionApp = mRoleManagerAdapter.getDefaultCallRedirectionApp();

        PhoneAccount phoneAccount = mPhoneAccountRegistrar

                .getPhoneAccountUnchecked(phoneAccountHandle);

        if (phoneAccount != null

                && !phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_MULTI_USER)) {

            // Check if the phoneAccountHandle belongs to the current user

            if (phoneAccountHandle != null &&

                    !phoneAccountHandle.getUserHandle().equals(mCurrentUserHandle)) {

                phoneAccountHandle = null;

            }

        }



        if (shouldCancelCall) {

            Log.w(this, "onCallRedirectionComplete: call is canceled");
@@ -1751,9 +1760,9 @@ public class CallsManager extends Call.ListenerBase 
            endEarly = true;

            disconnectReason = "Null handle from Call Redirection Service";

        } else if (phoneAccountHandle == null) {

            Log.w(this, "onCallRedirectionComplete: phoneAccountHandle is null");

            Log.w(this, "onCallRedirectionComplete: phoneAccountHandle is unavailable");

            endEarly = true;

            disconnectReason = "Null phoneAccountHandle from Call Redirection Service";

            disconnectReason = "Unavailable phoneAccountHandle from Call Redirection Service";

        } else if (mPhoneNumberUtilsAdapter.isPotentialLocalEmergencyNumber(mContext,

                handle.getSchemeSpecificPart())) {

            Log.w(this, "onCallRedirectionComplete: emergency number %s is redirected from Call"
@@ -1775,6 +1784,7 @@ public class CallsManager extends Call.ListenerBase 
            return;

        }



        final PhoneAccountHandle finalPhoneAccountHandle = phoneAccountHandle;

        if (uiAction.equals(CallRedirectionProcessor.UI_TYPE_USER_DEFINED_ASK_FOR_CONFIRM)) {

            Log.addEvent(call, LogUtils.Events.REDIRECTION_USER_CONFIRMATION);

            mPendingRedirectedOutgoingCall = call;
@@ -1784,7 +1794,7 @@ public class CallsManager extends Call.ListenerBase 
                        @Override

                        public void loggedRun() {

                            Log.addEvent(call, LogUtils.Events.REDIRECTION_USER_CONFIRMED);

                            call.setTargetPhoneAccount(phoneAccountHandle);

                            call.setTargetPhoneAccount(finalPhoneAccountHandle);

                            placeOutgoingCall(call, handle, gatewayInfo, speakerphoneOn,

                                    videoState);

                        }
@@ -1794,7 +1804,7 @@ public class CallsManager extends Call.ListenerBase 
                    new Runnable("CM.oCRC", mLock) {

                        @Override

                        public void loggedRun() {

                            call.setTargetPhoneAccount(phoneAccountHandle);

                            call.setTargetPhoneAccount(finalPhoneAccountHandle);

                            placeOutgoingCall(call, handle, null, speakerphoneOn,

                                    videoState);

                        }

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

+30 −21
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ import android.content.Intent; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.content.pm.ParceledListSlice;

import android.content.pm.ResolveInfo;

import android.net.Uri;

import android.os.Binder;

import android.os.Build;
@@ -178,19 +180,20 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getCallCapablePhoneAccounts(

        public ParceledListSlice<PhoneAccountHandle> getCallCapablePhoneAccounts(

                boolean includeDisabledAccounts, String callingPackage) {

            try {

                Log.startSession("TSI.gCCPA");

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

                    return Collections.emptyList();

                    return ParceledListSlice.emptyList();

                }

                synchronized (mLock) {

                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null,

                                includeDisabledAccounts, callingUserHandle);

                        return new ParceledListSlice<>(

                                mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null,

                                includeDisabledAccounts, callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getCallCapablePhoneAccounts");

                        throw e;
@@ -204,7 +207,8 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage) {

        public ParceledListSlice<PhoneAccountHandle> getSelfManagedPhoneAccounts(

                String callingPackage) {

            try {

                Log.startSession("TSI.gSMPA");

                if (!canReadPhoneState(callingPackage, "Requires READ_PHONE_STATE permission.")) {
@@ -214,8 +218,8 @@ public class TelecomServiceImpl { 
                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getSelfManagedPhoneAccounts(

                                callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getSelfManagedPhoneAccounts(callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getSelfManagedPhoneAccounts");

                        throw e;
@@ -228,9 +232,10 @@ public class TelecomServiceImpl { 
            }

        }





        @Override

        public List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(String uriScheme,

                String callingPackage) {

        public ParceledListSlice<PhoneAccountHandle> getPhoneAccountsSupportingScheme(

                String uriScheme, String callingPackage) {

             try {

                Log.startSession("TSI.gPASS");

                try {
@@ -239,15 +244,16 @@ public class TelecomServiceImpl { 
                } catch (SecurityException e) {

                    EventLog.writeEvent(0x534e4554, "62347125", Binder.getCallingUid(),

                            "getPhoneAccountsSupportingScheme: " + callingPackage);

                    return Collections.emptyList();

                    return ParceledListSlice.emptyList();

                }



                synchronized (mLock) {

                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getCallCapablePhoneAccounts(uriScheme, false,

                                callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getCallCapablePhoneAccounts(uriScheme, false,

                                callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getPhoneAccountsSupportingScheme %s", uriScheme);

                        throw e;
@@ -261,7 +267,8 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getPhoneAccountsForPackage(String packageName) {

        public ParceledListSlice<PhoneAccountHandle> getPhoneAccountsForPackage(

                String packageName) {

            //TODO: Deprecate this in S

            try {

                enforceCallingPackage(packageName);
@@ -284,8 +291,8 @@ public class TelecomServiceImpl { 
                long token = Binder.clearCallingIdentity();

                try {

                    Log.startSession("TSI.gPAFP");

                    return mPhoneAccountRegistrar.getPhoneAccountsForPackage(packageName,

                            callingUserHandle);

                    return new ParceledListSlice<>(mPhoneAccountRegistrar

                            .getPhoneAccountsForPackage(packageName, callingUserHandle));

                } catch (Exception e) {

                    Log.e(this, e, "getPhoneAccountsForPackage %s", packageName);

                    throw e;
@@ -336,7 +343,7 @@ public class TelecomServiceImpl { 
                synchronized (mLock) {

                    try {

                        // This list is pre-filtered for the calling user.

                        return getAllPhoneAccounts().size();

                        return getAllPhoneAccounts().getList().size();

                    } catch (Exception e) {

                        Log.e(this, e, "getAllPhoneAccountsCount");

                        throw e;
@@ -349,7 +356,7 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccount> getAllPhoneAccounts() {

        public ParceledListSlice<PhoneAccount> getAllPhoneAccounts() {

            synchronized (mLock) {

                try {

                    Log.startSession("TSI.gAPA");
@@ -365,7 +372,8 @@ public class TelecomServiceImpl { 
                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getAllPhoneAccounts(callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getAllPhoneAccounts(callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getAllPhoneAccounts");

                        throw e;
@@ -379,7 +387,7 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getAllPhoneAccountHandles() {

        public ParceledListSlice<PhoneAccountHandle> getAllPhoneAccountHandles() {

            try {

                Log.startSession("TSI.gAPAH");

                try {
@@ -395,7 +403,8 @@ public class TelecomServiceImpl { 
                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getAllPhoneAccountHandles(callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getAllPhoneAccountHandles(callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getAllPhoneAccounts");

                        throw e;

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

+91 −37

File changed.

Preview size limit exceeded, changes collapsed.

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

+13 −8
Original line number Diff line number Diff line
@@ -329,9 +329,12 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);



        assertEquals(fullPHList,

                mTSIBinder.getCallCapablePhoneAccounts(true, DEFAULT_DIALER_PACKAGE));

                mTSIBinder.getCallCapablePhoneAccounts(

                        true, DEFAULT_DIALER_PACKAGE).getList());



      assertEquals(smallPHList,

                mTSIBinder.getCallCapablePhoneAccounts(false, DEFAULT_DIALER_PACKAGE));

                mTSIBinder.getCallCapablePhoneAccounts(

                        false, DEFAULT_DIALER_PACKAGE).getList());

    }



    @SmallTest
@@ -346,7 +349,7 @@ public class TelecomServiceImplTest extends TelecomTestCase { 


        List<PhoneAccountHandle> result = null;

        try {

            result = mTSIBinder.getCallCapablePhoneAccounts(true, "");

            result = mTSIBinder.getCallCapablePhoneAccounts(true, "").getList();

        } catch (SecurityException e) {

            // intended behavior

        }
@@ -374,9 +377,11 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);



        assertEquals(telPHList,

                mTSIBinder.getPhoneAccountsSupportingScheme("tel", DEFAULT_DIALER_PACKAGE));

                mTSIBinder.getPhoneAccountsSupportingScheme(

                        "tel", DEFAULT_DIALER_PACKAGE).getList());

        assertEquals(sipPHList,

                mTSIBinder.getPhoneAccountsSupportingScheme("sip", DEFAULT_DIALER_PACKAGE));

                mTSIBinder.getPhoneAccountsSupportingScheme(

                        "sip", DEFAULT_DIALER_PACKAGE).getList());

    }



    @SmallTest
@@ -392,7 +397,7 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);

        assertEquals(phoneAccountHandleList,

                mTSIBinder.getPhoneAccountsForPackage(

                        TEL_PA_HANDLE_16.getComponentName().getPackageName()));

                        TEL_PA_HANDLE_16.getComponentName().getPackageName()).getList());

    }



    @SmallTest
@@ -415,7 +420,7 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        when(mFakePhoneAccountRegistrar.getAllPhoneAccounts(any(UserHandle.class)))

                .thenReturn(phoneAccountList);



        assertEquals(2, mTSIBinder.getAllPhoneAccounts().size());

        assertEquals(2, mTSIBinder.getAllPhoneAccounts().getList().size());

    }



    @SmallTest