Merge "switch TelecomManager List getters to ParceledListSlice" into tm-dev (c6e27c83) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1269,7 +1269,7 @@ public class TelecomManager {
	if (service != null) {		if (service != null) {
	try {		try {
	return service.getPhoneAccountsSupportingScheme(uriScheme,		return service.getPhoneAccountsSupportingScheme(uriScheme,
	mContext.getOpPackageName());		mContext.getOpPackageName()).getList();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsSupportingScheme", e);		Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsSupportingScheme", e);
	}		}
	@@ -1312,7 +1312,7 @@ public class TelecomManager {
	if (service != null) {		if (service != null) {
	try {		try {
	return service.getSelfManagedPhoneAccounts(mContext.getOpPackageName(),		return service.getSelfManagedPhoneAccounts(mContext.getOpPackageName(),
	mContext.getAttributionTag());		mContext.getAttributionTag()).getList();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelecomService#getSelfManagedPhoneAccounts()", e);		Log.e(TAG, "Error calling ITelecomService#getSelfManagedPhoneAccounts()", e);
	}		}
	@@ -1340,7 +1340,7 @@ public class TelecomManager {
	if (service != null) {		if (service != null) {
	try {		try {
	return service.getOwnSelfManagedPhoneAccounts(mContext.getOpPackageName(),		return service.getOwnSelfManagedPhoneAccounts(mContext.getOpPackageName(),
	mContext.getAttributionTag());		mContext.getAttributionTag()).getList();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowFromSystemServer();
	}		}
	@@ -1366,7 +1366,7 @@ public class TelecomManager {
	if (service != null) {		if (service != null) {
	try {		try {
	return service.getCallCapablePhoneAccounts(includeDisabledAccounts,		return service.getCallCapablePhoneAccounts(includeDisabledAccounts,
	mContext.getOpPackageName(), mContext.getAttributionTag());		mContext.getOpPackageName(), mContext.getAttributionTag()).getList();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelecomService#getCallCapablePhoneAccounts("		Log.e(TAG, "Error calling ITelecomService#getCallCapablePhoneAccounts("
	+ includeDisabledAccounts + ")", e);		+ includeDisabledAccounts + ")", e);
	@@ -1390,7 +1390,7 @@ public class TelecomManager {
	ITelecomService service = getTelecomService();		ITelecomService service = getTelecomService();
	if (service != null) {		if (service != null) {
	try {		try {
	return service.getPhoneAccountsForPackage(mContext.getPackageName());		return service.getPhoneAccountsForPackage(mContext.getPackageName()).getList();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsForPackage", e);		Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsForPackage", e);
	}		}
	@@ -1450,7 +1450,7 @@ public class TelecomManager {
	ITelecomService service = getTelecomService();		ITelecomService service = getTelecomService();
	if (service != null) {		if (service != null) {
	try {		try {
	return service.getAllPhoneAccounts();		return service.getAllPhoneAccounts().getList();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccounts", e);		Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccounts", e);
	}		}
	@@ -1469,7 +1469,7 @@ public class TelecomManager {
	ITelecomService service = getTelecomService();		ITelecomService service = getTelecomService();
	if (service != null) {		if (service != null) {
	try {		try {
	return service.getAllPhoneAccountHandles();		return service.getAllPhoneAccountHandles().getList();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountHandles", e);		Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountHandles", e);
	}		}

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

+8 −7

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

	/**		/**
	* Interface used to interact with Telecom. Mostly this is used by TelephonyManager for passing		* Interface used to interact with Telecom. Mostly this is used by TelephonyManager for passing
	@@ -57,31 +58,31 @@ interface ITelecomService {
	/**		/**
	* @see TelecomServiceImpl#getCallCapablePhoneAccounts		* @see TelecomServiceImpl#getCallCapablePhoneAccounts
	*/		*/
	List<PhoneAccountHandle> getCallCapablePhoneAccounts(		ParceledListSlice<PhoneAccountHandle> getCallCapablePhoneAccounts(
	boolean includeDisabledAccounts, String callingPackage, String callingFeatureId);		boolean includeDisabledAccounts, String callingPackage, String callingFeatureId);

	/**		/**
	* @see TelecomServiceImpl#getSelfManagedPhoneAccounts		* @see TelecomServiceImpl#getSelfManagedPhoneAccounts
	*/		*/
	List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage,		ParceledListSlice<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage,
	String callingFeatureId);		String callingFeatureId);

	/**		/**
	* @see TelecomServiceImpl#getOwnSelfManagedPhoneAccounts		* @see TelecomServiceImpl#getOwnSelfManagedPhoneAccounts
	*/		*/
	List<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts(String callingPackage,		ParceledListSlice<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts(String callingPackage,
	String callingFeatureId);		String callingFeatureId);

	/**		/**
	* @see TelecomManager#getPhoneAccountsSupportingScheme		* @see TelecomManager#getPhoneAccountsSupportingScheme
	*/		*/
	List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(in String uriScheme,		ParceledListSlice<PhoneAccountHandle> getPhoneAccountsSupportingScheme(in String uriScheme,
	String callingPackage);		String callingPackage);

	/**		/**
	* @see TelecomManager#getPhoneAccountsForPackage		* @see TelecomManager#getPhoneAccountsForPackage
	*/		*/
	List<PhoneAccountHandle> getPhoneAccountsForPackage(in String packageName);		ParceledListSlice<PhoneAccountHandle> getPhoneAccountsForPackage(in String packageName);

	/**		/**
	* @see TelecomManager#getPhoneAccount		* @see TelecomManager#getPhoneAccount