Merge "switch TelecomManager List getters to ParceledListSlice" (7756b138) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -1269,7 +1269,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);
		}
		@@ -1312,7 +1312,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);
		}
		@@ -1340,7 +1340,7 @@ public class TelecomManager {
		if (service != null) {
		try {
		return service.getOwnSelfManagedPhoneAccounts(mContext.getOpPackageName(),
		mContext.getAttributionTag());
		mContext.getAttributionTag()).getList();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1366,7 +1366,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);
		@@ -1390,7 +1390,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);
		}
		@@ -1450,7 +1450,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);
		}
		@@ -1469,7 +1469,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

+8 −7

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.net.Uri;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.telecom.PhoneAccount;
		import android.content.pm.ParceledListSlice;

		/**
		* Interface used to interact with Telecom. Mostly this is used by TelephonyManager for passing
		@@ -57,31 +58,31 @@ 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 TelecomServiceImpl#getOwnSelfManagedPhoneAccounts
		*/
		List<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts(String callingPackage,
		ParceledListSlice<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts(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
		@@ -96,12 +97,12 @@ interface ITelecomService {
		/**
		* @see TelecomManager#getAllPhoneAccounts
		*/
		List<PhoneAccount> getAllPhoneAccounts();
		ParceledListSlice<PhoneAccount> getAllPhoneAccounts();

		/**
		* @see TelecomManager#getAllPhoneAccountHandles
		*/
		List<PhoneAccountHandle> getAllPhoneAccountHandles();
		ParceledListSlice<PhoneAccountHandle> getAllPhoneAccountHandles();

		/**
		* @see TelecomServiceImpl#getSimCallManager