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

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

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

Change-Id: I3751af9dda8a9b79d433bf23dc6bf6997aa5a5fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thomas Stuart
2022-08-10 20:10:22 +00:00
committed by Automerger Merge Worker
parent a173229e2f 2f287743a4
commit b680cef434
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

@@ -1136,7 +1136,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);
@@ -1179,7 +1179,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);
@@ -1205,7 +1205,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(" +
@@ -1225,7 +1225,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);
@@ -1279,7 +1280,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);
@@ -1297,7 +1298,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