summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jordan Liu <jminjie@google.com> 2017-04-17 18:14:23 +0000
committer android-build-merger <android-build-merger@google.com> 2017-04-17 18:14:23 +0000
commitea4a67ddd106ff7e4d9bcfc600288431d59537e9 (patch)
treefc738d97373c8e36978b2ec6a7d534607ec8b188
parent334fe54661ca7b3f75213a40fa86ddeccaf2f932 (diff)
parent286b5f117deb105b5550eb579d543c761de7ad74 (diff)
Merge "Update api for ServiceStateProvider"
am: 286b5f117d Change-Id: I8404dad9be43a0ea41a973d289014a4fe1529ab3
-rw-r--r--api/current.txt10
-rw-r--r--api/system-current.txt10
-rw-r--r--api/test-current.txt10
3 files changed, 30 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 4b837d6c15a7..22583b3600ea 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -33653,6 +33653,16 @@ package android.provider {
field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id";
}
+ public static final class Telephony.ServiceStateTable {
+ method public static android.net.Uri getUriForSubId(int);
+ method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String);
+ field public static final java.lang.String AUTHORITY = "service-state";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";
+ field public static final java.lang.String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";
+ field public static final java.lang.String VOICE_REG_STATE = "voice_reg_state";
+ }
+
public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
method public static java.lang.String getDefaultSmsPackage(android.content.Context);
field public static final android.net.Uri CONTENT_URI;
diff --git a/api/system-current.txt b/api/system-current.txt
index 9c831e9b517a..1cb83f19ae34 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -36497,6 +36497,16 @@ package android.provider {
field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id";
}
+ public static final class Telephony.ServiceStateTable {
+ method public static android.net.Uri getUriForSubId(int);
+ method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String);
+ field public static final java.lang.String AUTHORITY = "service-state";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";
+ field public static final java.lang.String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";
+ field public static final java.lang.String VOICE_REG_STATE = "voice_reg_state";
+ }
+
public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
method public static java.lang.String getDefaultSmsPackage(android.content.Context);
field public static final android.net.Uri CONTENT_URI;
diff --git a/api/test-current.txt b/api/test-current.txt
index 755d1b9291c4..b7e86131375f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -33734,6 +33734,16 @@ package android.provider {
field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id";
}
+ public static final class Telephony.ServiceStateTable {
+ method public static android.net.Uri getUriForSubId(int);
+ method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String);
+ field public static final java.lang.String AUTHORITY = "service-state";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";
+ field public static final java.lang.String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";
+ field public static final java.lang.String VOICE_REG_STATE = "voice_reg_state";
+ }
+
public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
method public static java.lang.String getDefaultSmsPackage(android.content.Context);
field public static final android.net.Uri CONTENT_URI;