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

Commit b680cef4 authored by Thomas Stuart's avatar Thomas Stuart Committed by Automerger Merge Worker
Browse files

Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743 

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



Change-Id: I3751af9dda8a9b79d433bf23dc6bf6997aa5a5fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a173229e 2f287743

telecomm/java/android/telecom/TelecomManager.java

+7 −6
Original line number Diff line number Diff line
@@ -1136,7 +1136,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);
@@ -1179,7 +1179,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);
@@ -1205,7 +1205,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(" +
@@ -1225,7 +1225,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);
@@ -1279,7 +1280,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);
@@ -1297,7 +1298,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