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

Commit 3ff00b52 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d180 

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



Change-Id: Ibc4990d59b8a9d353c05365b867d12bc798cc171
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6b9cb35 8f07d180

telecomm/java/android/telecom/TelecomManager.java

+8 −6
Original line number Diff line number Diff line
@@ -953,7 +953,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);
@@ -995,7 +995,8 @@ public class TelecomManager { 
    public List<PhoneAccountHandle> getSelfManagedPhoneAccounts() {

        try {

            if (isServiceConnected()) {

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

                return getTelecomService()

                  .getSelfManagedPhoneAccounts(mContext.getOpPackageName()).getList();

            }

        } catch (RemoteException e) {

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

            if (isServiceConnected()) {

                return getTelecomService().getCallCapablePhoneAccounts(

                        includeDisabledAccounts, mContext.getOpPackageName());

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

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#getCallCapablePhoneAccounts(" +
@@ -1037,7 +1038,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);
@@ -1091,7 +1093,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);
@@ -1109,7 +1111,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
@@ -55,24 +56,24 @@ interface ITelecomService { 
    /**

     * @see TelecomServiceImpl#getCallCapablePhoneAccounts

     */

    List<PhoneAccountHandle> getCallCapablePhoneAccounts(

    ParceledListSlice getCallCapablePhoneAccounts(

            boolean includeDisabledAccounts, String callingPackage);



    /**

     * @see TelecomServiceImpl#getSelfManagedPhoneAccounts

     */

    List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage);

    ParceledListSlice getSelfManagedPhoneAccounts(String callingPackage);



    /**

     * @see TelecomManager#getPhoneAccountsSupportingScheme

     */

    List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(in String uriScheme,

    ParceledListSlice getPhoneAccountsSupportingScheme(in String uriScheme,

            String callingPackage);



    /**

     * @see TelecomManager#getPhoneAccountsForPackage

     */

    List<PhoneAccountHandle> getPhoneAccountsForPackage(in String packageName);

    ParceledListSlice getPhoneAccountsForPackage(in String packageName);



    /**

     * @see TelecomManager#getPhoneAccount
@@ -87,12 +88,12 @@ interface ITelecomService { 
    /**

     * @see TelecomManager#getAllPhoneAccounts

     */

    List<PhoneAccount> getAllPhoneAccounts();

    ParceledListSlice getAllPhoneAccounts();



    /**

     * @see TelecomManager#getAllPhoneAccountHandles

     */

    List<PhoneAccountHandle> getAllPhoneAccountHandles();

    ParceledListSlice getAllPhoneAccountHandles();



    /**

     * @see TelecomServiceImpl#getSimCallManager