From 0f332523b2edf3f1b5e935661b8b4400c76a71be Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Wed, 19 Apr 2017 14:25:29 -0700 Subject: [PATCH] Use SubscriptionId instead of SubId Rename the methods and arguments in ServiceStateTable to use SubscriptionId instead of SubId. Change-Id: I6f99da3bf533cab74f5ec81aac4f62e63d55378a Fixes: 35766624 Test: Existing unit tests pass --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- telephony/java/android/telephony/Telephony.java | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index e4169b2b7899a..069899de92002 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35451,8 +35451,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"; diff --git a/api/system-current.txt b/api/system-current.txt index 5dd3b88f4ab7d..3ff89812fa0ec 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -38552,8 +38552,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"; diff --git a/api/test-current.txt b/api/test-current.txt index 47a0fd8f84998..0be41db8f60e1 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -35591,8 +35591,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"; diff --git a/telephony/java/android/telephony/Telephony.java b/telephony/java/android/telephony/Telephony.java index eeaf2c121a756..3282f5f31960e 100644 --- a/telephony/java/android/telephony/Telephony.java +++ b/telephony/java/android/telephony/Telephony.java @@ -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(); } /**