Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch TelecomManager List getters to ParceledListSlice

Browse Source 
It was shown that given a large phoneAccountHandles that are
over 1 mb, a TransactionTooLarge exception can be silently thrown
causing an empty list to be returned.

In order to prevent this behavior, all Lists that return a
PhoneAccountHandle or PhoneAccount have been switched to
ParceledListSlice.

bug: 236263294
Test: atest android.telecom.cts.PhoneAccountRegistrarTest
             #testRegisterPhoneAccountHandleWithFieldOverLimit
Change-Id: I025245b2a6f8cfaca86f268851a9d8f0817e07dd
Merged-In: I025245b2a6f8cfaca86f268851a9d8f0817e07dd
This commit is contained in:
Thomas Stuart
2022-06-23 14:27:43 -07:00
parent d307aa8bed
commit f5ab5186da
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -1128,7 +1128,7 @@ public class TelecomManager {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
return getTelecomService().getPhoneAccountsSupportingScheme(uriScheme, return getTelecomService().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);
@@ -1171,7 +1171,7 @@ public class TelecomManager {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
return getTelecomService().getSelfManagedPhoneAccounts(mContext.getOpPackageName(), return getTelecomService().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);
@@ -1197,7 +1197,7 @@ public class TelecomManager {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
return getTelecomService().getCallCapablePhoneAccounts(includeDisabledAccounts, return getTelecomService().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(" +
@@ -1217,7 +1217,8 @@ public class TelecomManager {
public List<PhoneAccountHandle> getPhoneAccountsForPackage() { public List<PhoneAccountHandle> getPhoneAccountsForPackage() {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
return getTelecomService().getPhoneAccountsForPackage(mContext.getPackageName()); return getTelecomService()
.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);
@@ -1271,7 +1272,7 @@ public class TelecomManager {
public List<PhoneAccount> getAllPhoneAccounts() { public List<PhoneAccount> getAllPhoneAccounts() {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
return getTelecomService().getAllPhoneAccounts(); return getTelecomService().getAllPhoneAccounts().getList();
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccounts", e); Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccounts", e);
@@ -1289,7 +1290,7 @@ public class TelecomManager {
public List<PhoneAccountHandle> getAllPhoneAccountHandles() { public List<PhoneAccountHandle> getAllPhoneAccountHandles() {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
return getTelecomService().getAllPhoneAccountHandles(); return getTelecomService().getAllPhoneAccountHandles().getList();
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountHandles", e); Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountHandles", e);

13
telecomm/java/com/android/internal/telecom/ITelecomService.aidl
View File

@@ -23,6 +23,7 @@ import android.telecom.PhoneAccountHandle;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
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
@@ -56,25 +57,25 @@ 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 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
@@ -89,12 +90,12 @@ interface ITelecomService {
/** /**
* @see TelecomManager#getAllPhoneAccounts * @see TelecomManager#getAllPhoneAccounts
*/ */
List<PhoneAccount> getAllPhoneAccounts(); ParceledListSlice<PhoneAccount> getAllPhoneAccounts();
/** /**
* @see TelecomManager#getAllPhoneAccountHandles * @see TelecomManager#getAllPhoneAccountHandles
*/ */
List<PhoneAccountHandle> getAllPhoneAccountHandles(); ParceledListSlice<PhoneAccountHandle> getAllPhoneAccountHandles();
/** /**
* @see TelecomServiceImpl#getSimCallManager * @see TelecomServiceImpl#getSimCallManager