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

Commit aabfda37 authored by Meng Wang's avatar Meng Wang Committed by Automerger Merge Worker
Browse files

Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca3 am: f5997ba8 

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

Change-Id: Ibac117099202d1fd2589c828270e3f3b09577479
parents 8af7727a f5997ba8

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12122,6 +12122,7 @@ package android.telephony.ims { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);

    field public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67; // 0x43

    field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b

    field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a

    field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4606,6 +4606,7 @@ package android.telephony.ims { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);

    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);

    field public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67; // 0x43

    field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b

    field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a

    field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0

non-updatable-api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11004,6 +11004,7 @@ package android.telephony.ims { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);

    field public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67; // 0x43

    field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b

    field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a

    field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0

telephony/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1618,6 +1618,7 @@ package android.telephony.ims { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);

    field public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67; // 0x43

    field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b

    field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a

    field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0

telephony/java/android/telephony/ims/ProvisioningManager.java

+13 −0
Original line number Diff line number Diff line
@@ -850,6 +850,19 @@ public class ProvisioningManager { 
     */

    public static final int KEY_RTT_ENABLED = 66;



    /**

     * An obfuscated string defined by the carrier to indicate VoWiFi entitlement status.

     *

     * <p>Implementation note: how to generate the value and how it affects VoWiFi service

     * should follow carrier requirements. For example, set an empty string could result in

     * VoWiFi being disabled by IMS service, and set to a specific string could enable.

     *

     * <p>Value is in String format.

     * @see #setProvisioningStringValue(int, String)

     * @see #getProvisioningStringValue(int)

     */

    public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67;



    /**

     * Callback for IMS provisioning changes.

     */