Merge "Use SubscriptionId instead of SubId"

This commit is contained in:
Jordan Liu
2017-04-21 18:17:51 +00:00
committed by Gerrit Code Review
3 changed files with 6 additions and 6 deletions

View File

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

View File

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

View File

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