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

Commit 561ce884 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] switch TelecomManager List getters to ParceledListSlice 2p: d54a48f4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19369770

Bug: 236263294
Change-Id: Ibb1d5a32c345eed74667a9dedf9179fae961adea
Merged-In: I025245b2a6f8cfaca86f268851a9d8f0817e07dd
parents ef65df92 d54a48f4

telecomm/java/android/telecom/TelecomManager.java

+6 −6
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ public class TelecomManager { 
        if (service != null) {

            try {

                return service.getPhoneAccountsSupportingScheme(uriScheme,

                        mContext.getOpPackageName());

                        mContext.getOpPackageName()).getList();

            } catch (RemoteException e) {

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

            }
@@ -1299,7 +1299,7 @@ public class TelecomManager { 
        if (service != null) {

            try {

                return service.getSelfManagedPhoneAccounts(mContext.getOpPackageName(),

                        mContext.getAttributionTag());

                        mContext.getAttributionTag()).getList();

            } catch (RemoteException e) {

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

            }
@@ -1325,7 +1325,7 @@ public class TelecomManager { 
        if (service != null) {

            try {

                return service.getCallCapablePhoneAccounts(includeDisabledAccounts,

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

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

            } catch (RemoteException e) {

                Log.e(TAG, "Error calling ITelecomService#getCallCapablePhoneAccounts("

                        + includeDisabledAccounts + ")", e);
@@ -1349,7 +1349,7 @@ public class TelecomManager { 
        ITelecomService service = getTelecomService();

        if (service != null) {

            try {

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

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

            } catch (RemoteException e) {

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

            }
@@ -1409,7 +1409,7 @@ public class TelecomManager { 
        ITelecomService service = getTelecomService();

        if (service != null) {

            try {

                return service.getAllPhoneAccounts();

                return service.getAllPhoneAccounts().getList();

            } catch (RemoteException e) {

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

            }
@@ -1428,7 +1428,7 @@ public class TelecomManager { 
        ITelecomService service = getTelecomService();

        if (service != null) {

            try {

                return service.getAllPhoneAccountHandles();

                return service.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