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

Merge "Use SubscriptionId instead of SubId" am: 946410eef5

Browse Source 
am: 9cad054e02

Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e
This commit is contained in:
Jordan Liu
2017-04-21 18:30:29 +00:00
committed by android-build-merger
parent 96b140489c 9cad054e02
commit fb0acf3355
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -33650,8 +33650,8 @@ package android.provider {
} }
public static final class Telephony.ServiceStateTable { public static final class Telephony.ServiceStateTable {
method public static android.net.Uri getUriForSubId(int); method public static android.net.Uri getUriForSubscriptionId(int);
method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String); method public static android.net.Uri getUriForSubscriptionIdAndField(int, java.lang.String);
field public static final java.lang.String AUTHORITY = "service-state"; field public static final java.lang.String AUTHORITY = "service-state";
field public static final android.net.Uri CONTENT_URI; 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 IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";

4
api/system-current.txt
View File

@@ -36494,8 +36494,8 @@ package android.provider {
} }
public static final class Telephony.ServiceStateTable { public static final class Telephony.ServiceStateTable {
method public static android.net.Uri getUriForSubId(int); method public static android.net.Uri getUriForSubscriptionId(int);
method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String); method public static android.net.Uri getUriForSubscriptionIdAndField(int, java.lang.String);
field public static final java.lang.String AUTHORITY = "service-state"; field public static final java.lang.String AUTHORITY = "service-state";
field public static final android.net.Uri CONTENT_URI; 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 IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";

4
api/test-current.txt
View File

@@ -33731,8 +33731,8 @@ package android.provider {
} }
public static final class Telephony.ServiceStateTable { public static final class Telephony.ServiceStateTable {
method public static android.net.Uri getUriForSubId(int); method public static android.net.Uri getUriForSubscriptionId(int);
method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String); method public static android.net.Uri getUriForSubscriptionIdAndField(int, java.lang.String);
field public static final java.lang.String AUTHORITY = "service-state"; field public static final java.lang.String AUTHORITY = "service-state";
field public static final android.net.Uri CONTENT_URI; 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 IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";