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

Commit f5ab5186 authored by Thomas Stuart's avatar Thomas Stuart
Browse files

switch TelecomManager List getters to ParceledListSlice 

It was shown that given a large phoneAccountHandles that are
over 1 mb, a TransactionTooLarge exception can be silently thrown
causing an empty list to be returned.

In order to prevent this behavior, all Lists that return a
PhoneAccountHandle or PhoneAccount have been switched to
ParceledListSlice.

bug: 236263294
Test: atest android.telecom.cts.PhoneAccountRegistrarTest
             #testRegisterPhoneAccountHandleWithFieldOverLimit
Change-Id: I025245b2a6f8cfaca86f268851a9d8f0817e07dd
Merged-In: I025245b2a6f8cfaca86f268851a9d8f0817e07dd
parent d307aa8b

telecomm/java/android/telecom/TelecomManager.java

+7 −6
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ public class TelecomManager { 
        try {

            if (isServiceConnected()) {

                return getTelecomService().getPhoneAccountsSupportingScheme(uriScheme,

                        mContext.getOpPackageName());

                        mContext.getOpPackageName()).getList();

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsSupportingScheme", e);
@@ -1171,7 +1171,7 @@ public class TelecomManager { 
        try {

            if (isServiceConnected()) {

                return getTelecomService().getSelfManagedPhoneAccounts(mContext.getOpPackageName(),

                        mContext.getAttributionTag());

                        mContext.getAttributionTag()).getList();

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#getSelfManagedPhoneAccounts()", e);
@@ -1197,7 +1197,7 @@ public class TelecomManager { 
        try {

            if (isServiceConnected()) {

                return getTelecomService().getCallCapablePhoneAccounts(includeDisabledAccounts,

                        mContext.getOpPackageName(), mContext.getAttributionTag());

                        mContext.getOpPackageName(), mContext.getAttributionTag()).getList();

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#getCallCapablePhoneAccounts(" +
@@ -1217,7 +1217,8 @@ public class TelecomManager { 
    public List<PhoneAccountHandle> getPhoneAccountsForPackage() {

        try {

            if (isServiceConnected()) {

                return getTelecomService().getPhoneAccountsForPackage(mContext.getPackageName());

                return getTelecomService()

                  .getPhoneAccountsForPackage(mContext.getPackageName()).getList();

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsForPackage", e);
@@ -1271,7 +1272,7 @@ public class TelecomManager { 
    public List<PhoneAccount> getAllPhoneAccounts() {

        try {

            if (isServiceConnected()) {

                return getTelecomService().getAllPhoneAccounts();

                return getTelecomService().getAllPhoneAccounts().getList();

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccounts", e);
@@ -1289,7 +1290,7 @@ public class TelecomManager { 
    public List<PhoneAccountHandle> getAllPhoneAccountHandles() {

        try {

            if (isServiceConnected()) {

                return getTelecomService().getAllPhoneAccountHandles();

                return getTelecomService().getAllPhoneAccountHandles().getList();

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountHandles", e);

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+7 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.telecom.PhoneAccountHandle; 
import android.net.Uri;

import android.os.Bundle;

import android.telecom.PhoneAccount;

import android.content.pm.ParceledListSlice;



/**

 * Interface used to interact with Telecom. Mostly this is used by TelephonyManager for passing
@@ -56,25 +57,25 @@ interface ITelecomService { 
    /**

     * @see TelecomServiceImpl#getCallCapablePhoneAccounts

     */

    List<PhoneAccountHandle> getCallCapablePhoneAccounts(

    ParceledListSlice<PhoneAccountHandle> getCallCapablePhoneAccounts(

            boolean includeDisabledAccounts, String callingPackage, String callingFeatureId);



    /**

     * @see TelecomServiceImpl#getSelfManagedPhoneAccounts

     */

    List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage,

    ParceledListSlice<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage,

            String callingFeatureId);



    /**

     * @see TelecomManager#getPhoneAccountsSupportingScheme

     */

    List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(in String uriScheme,

    ParceledListSlice<PhoneAccountHandle> getPhoneAccountsSupportingScheme(in String uriScheme,

            String callingPackage);



    /**

     * @see TelecomManager#getPhoneAccountsForPackage

     */

    List<PhoneAccountHandle> getPhoneAccountsForPackage(in String packageName);

    ParceledListSlice<PhoneAccountHandle> getPhoneAccountsForPackage(in String packageName);



    /**

     * @see TelecomManager#getPhoneAccount
@@ -89,12 +90,12 @@ interface ITelecomService { 
    /**

     * @see TelecomManager#getAllPhoneAccounts

     */

    List<PhoneAccount> getAllPhoneAccounts();

    ParceledListSlice<PhoneAccount> getAllPhoneAccounts();



    /**

     * @see TelecomManager#getAllPhoneAccountHandles

     */

    List<PhoneAccountHandle> getAllPhoneAccountHandles();

    ParceledListSlice<PhoneAccountHandle> getAllPhoneAccountHandles();



    /**

     * @see TelecomServiceImpl#getSimCallManager