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

Merge "Update api for ServiceStateProvider" am: 286b5f117d

Browse Source 
am: ea4a67ddd1

Change-Id: Ib0ac43e24dbd4b1c0f037f6f3f3bc81b9acbae62
This commit is contained in:
Jordan Liu
2017-04-17 18:21:56 +00:00
committed by android-build-merger
parent 2dda9f5d66 ea4a67ddd1
commit 56a13d1bce
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/current.txt
View File

@@ -33653,6 +33653,16 @@ package android.provider {
field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id"; 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 { public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
method public static java.lang.String getDefaultSmsPackage(android.content.Context); method public static java.lang.String getDefaultSmsPackage(android.content.Context);
field public static final android.net.Uri CONTENT_URI; field public static final android.net.Uri CONTENT_URI;

10
api/system-current.txt
View File

@@ -36497,6 +36497,16 @@ package android.provider {
field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id"; 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 { public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
method public static java.lang.String getDefaultSmsPackage(android.content.Context); method public static java.lang.String getDefaultSmsPackage(android.content.Context);
field public static final android.net.Uri CONTENT_URI; field public static final android.net.Uri CONTENT_URI;

10
api/test-current.txt
View File

@@ -33734,6 +33734,16 @@ package android.provider {
field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id"; 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 { public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
method public static java.lang.String getDefaultSmsPackage(android.content.Context); method public static java.lang.String getDefaultSmsPackage(android.content.Context);
field public static final android.net.Uri CONTENT_URI; field public static final android.net.Uri CONTENT_URI;