summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorMeng Wang <mewan@google.com>2020-08-18 19:34:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-08-18 19:34:51 +0000
commit5c8e5ca313a8537ffd172561baf8200afb8c5d47 (patch)
tree936fc408055aafad87241e8f6fbdd9de08292de9 /api
parentbb7674fad3ffea97a090672ff301353c154becdc (diff)
parentf3c71997ee85846ab1a334cccd3750c8a8c1b417 (diff)
Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID"
Diffstat (limited to 'api')
-rwxr-xr-xapi/system-current.txt1
-rw-r--r--api/test-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index cbad95ab6835..0017136cd65f 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9991,6 +9991,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
diff --git a/api/test-current.txt b/api/test-current.txt
index 6fe730ae08bf..b74f2e4bb39e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3780,6 +3780,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