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

Merge "Add a TestApi, TelephonyManager#isDomainSelectionSupported"

Browse Source
This commit is contained in:
Hunsuk Choi
2022-12-16 06:02:44 +00:00
committed by Android (Google) Code Review
parent c564c8bbb7 9854fdc30e
commit a2f5bcfdf0
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -2684,6 +2684,7 @@ package android.telephony {
method @NonNull public android.util.Pair<java.lang.Integer,java.lang.Integer> getHalVersion(int);
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();
method @Deprecated public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDomainSelectionSupported();
method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);

24
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -17933,4 +17933,28 @@ public class TelephonyManager {
ex.rethrowFromSystemServer();
}
}
/**
* Returns whether the domain selection service is supported.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE}.
*
* @return {@code true} if the domain selection service is supported.
* @hide
*/
@TestApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING)
public boolean isDomainSelectionSupported() {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.isDomainSelectionSupported();
}
} catch (RemoteException ex) {
Rlog.w(TAG, "RemoteException", ex);
}
return false;
}
}

7
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -2670,4 +2670,11 @@ interface ITelephony {
*/
void setCellBroadcastIdRanges(int subId, in List<CellBroadcastIdRange> ranges,
IIntegerConsumer callback);
/**
* Returns whether the domain selection service is supported.
*
* @return {@code true} if the domain selection service is supported.
*/
boolean isDomainSelectionSupported();
}