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

Merge "decouple TelecomManager#getSelfManagedPhoneAccounts (2/3)" into tm-dev

Browse Source
This commit is contained in:
Thomas Stuart
2022-03-01 18:30:34 +00:00
committed by Android (Google) Code Review
parent bb72d0febd 4e1184dc26
commit 286c318ad2
3 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/current.txt
View File

@@ -40754,8 +40754,9 @@ package android.telecom {
method public String getDefaultDialerPackage();
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(String);
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}, conditional=true) public String getLine1Number(android.telecom.PhoneAccountHandle);
method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_OWN_CALLS) public java.util.List<android.telecom.PhoneAccountHandle> getOwnSelfManagedPhoneAccounts();
method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);
method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.MANAGE_OWN_CALLS}) public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts();
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts();
method public android.telecom.PhoneAccountHandle getSimCallManager();
method @Nullable public android.telecom.PhoneAccountHandle getSimCallManagerForSubscription(int);
method @Nullable public String getSystemDialerPackage();

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

@@ -1292,31 +1292,22 @@ public class TelecomManager {
}
/**
* Returns a list of {@link PhoneAccountHandle}s for self-managed {@link ConnectionService}s.
* Returns a list of {@link PhoneAccountHandle}s for all self-managed
* {@link ConnectionService}s owned by the calling {@link UserHandle}.
* <p>
* Self-Managed {@link ConnectionService}s have a {@link PhoneAccount} with
* {@link PhoneAccount#CAPABILITY_SELF_MANAGED}.
* <p>
* Requires permission {@link android.Manifest.permission#READ_PHONE_STATE}, or that the caller
* is the default dialer app to get all phone account handles.
* <P>
* If the caller doesn't meet any of the above requirements and has {@link
* android.Manifest.permission#MANAGE_OWN_CALLS}, the caller can get only the phone account
* handles they have registered.
* is the default dialer app.
* <p>
* A {@link SecurityException} will be thrown if the caller is not the default dialer
* or the caller does not have at least one of the following permissions:
* {@link android.Manifest.permission#READ_PHONE_STATE} permission,
* {@link android.Manifest.permission#MANAGE_OWN_CALLS} permission
* A {@link SecurityException} will be thrown if a called is not the default dialer, or lacks
* the {@link android.Manifest.permission#READ_PHONE_STATE} permission.
*
* @return A list of {@code PhoneAccountHandle} objects.
*/
@RequiresPermission(anyOf = {
READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE,
android.Manifest.permission.MANAGE_OWN_CALLS
})
public List<PhoneAccountHandle> getSelfManagedPhoneAccounts() {
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public @NonNull List<PhoneAccountHandle> getSelfManagedPhoneAccounts() {
ITelecomService service = getTelecomService();
if (service != null) {
try {
@@ -1329,6 +1320,34 @@ public class TelecomManager {
return new ArrayList<>();
}
/**
* Returns a list of {@link PhoneAccountHandle}s owned by the calling self-managed
* {@link ConnectionService}.
* <p>
* Self-Managed {@link ConnectionService}s have a {@link PhoneAccount} with
* {@link PhoneAccount#CAPABILITY_SELF_MANAGED}.
* <p>
* Requires permission {@link android.Manifest.permission#MANAGE_OWN_CALLS}
* <p>
* A {@link SecurityException} will be thrown if a caller lacks the
* {@link android.Manifest.permission#MANAGE_OWN_CALLS} permission.
*
* @return A list of {@code PhoneAccountHandle} objects.
*/
@RequiresPermission(Manifest.permission.MANAGE_OWN_CALLS)
public @NonNull List<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts() {
ITelecomService service = getTelecomService();
if (service != null) {
try {
return service.getOwnSelfManagedPhoneAccounts(mContext.getOpPackageName(),
mContext.getAttributionTag());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
throw new IllegalStateException("Telecom is not available");
}
/**
* Returns a list of {@link PhoneAccountHandle}s including those which have not been enabled
* by the user.

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

@@ -65,6 +65,12 @@ interface ITelecomService {
List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage,
String callingFeatureId);
/**
* @see TelecomServiceImpl#getOwnSelfManagedPhoneAccounts
*/
List<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts(String callingPackage,
String callingFeatureId);
/**
* @see TelecomManager#getPhoneAccountsSupportingScheme
*/