Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a958e26 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "update isCrossSimCallingEnabledByUser name" into sc-dev am: b8812e92 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee323f7f30909b7c7bd5268a51dba93448c776bc
parents aae438df b8812e92

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -42918,7 +42918,7 @@ package android.telephony.ims { 
    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public int getVoWiFiModeSetting();

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isAdvancedCallingSettingEnabled();

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isCrossSimCallingEnabledByUser() throws android.telephony.ims.ImsException;

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isCrossSimCallingEnabled() throws android.telephony.ims.ImsException;

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isTtyOverVolteEnabled();

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isVoWiFiRoamingSettingEnabled();

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isVoWiFiSettingEnabled();

telephony/java/android/telephony/SubscriptionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ public class SubscriptionManager { 
     * <p>

     * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

     * subscription cross sim calling enabled

     * {@link ImsMmTelManager#isCrossSimCallingEnabledByUser()}

     * {@link ImsMmTelManager#isCrossSimCallingEnabled()}

     * while your app is running. You can also use a {@link android.app.job.JobService}

     * to ensure your app

     * is notified of changes to the {@link Uri} even when it is not running.

telephony/java/android/telephony/ims/ImsMmTelManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ public class ImsMmTelManager implements RegistrationManager { 
    @RequiresPermission(anyOf = {

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

            android.Manifest.permission.READ_PRECISE_PHONE_STATE})

    public boolean isCrossSimCallingEnabledByUser() throws ImsException {

    public boolean isCrossSimCallingEnabled() throws ImsException {

        ITelephony iTelephony = getITelephony();

        if (iTelephony == null) {

            throw new ImsException("Could not find Telephony Service.",
@@ -1058,7 +1058,7 @@ public class ImsMmTelManager implements RegistrationManager { 
     * the IMS service is not available.

     * @param isEnabled true if the user's setting for Voice over Cross SIM is enabled,

     *                 false otherwise

     * @see #isCrossSimCallingEnabledByUser()

     * @see #isCrossSimCallingEnabled()

     * @hide

     */

    @SystemApi