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

Merge "Use SubscriptionId instead of SubId" into oc-dev

Browse Source
This commit is contained in:
Jordan Liu
2017-04-20 17:02:50 +00:00
committed by Android (Google) Code Review
parent bd3d0dea88 0f332523b2
commit 8079a69eba
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -35448,8 +35448,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";

4
api/system-current.txt
View File

@@ -38551,8 +38551,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";

4
api/test-current.txt
View File

@@ -35588,8 +35588,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";

12
telephony/java/android/telephony/Telephony.java
View File

@@ -3008,12 +3008,12 @@ public final class Telephony {
* Note, however, that using a {@link JobService} does not guarantee timely delivery of
* updates to the {@link Uri}.
*
* @param subId the subId to receive updates on
* @param subscriptionId the subscriptionId to receive updates on
* @param field the ServiceState field to receive updates on
* @return the Uri used to observe {@link ServiceState} changes
*/
public static Uri getUriForSubIdAndField(int subId, String field) {
return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subId))
public static Uri getUriForSubscriptionIdAndField(int subscriptionId, String field) {
return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subscriptionId))
.appendEncodedPath(field).build();
}
@@ -3027,11 +3027,11 @@ public final class Telephony {
* Note, however, that using a {@link JobService} does not guarantee timely delivery of
* updates to the {@link Uri}.
*
* @param subId the subId to receive updates on
* @param subscriptionId the subscriptionId to receive updates on
* @return the Uri used to observe {@link ServiceState} changes
*/
public static Uri getUriForSubId(int subId) {
return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subId)).build();
public static Uri getUriForSubscriptionId(int subscriptionId) {
return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subscriptionId)).build();
}
/**