commit 0f332523b2edf3f1b5e935661b8b4400c76a71be
author Jordan Liu <jminjie@google.com> Wed Apr 19 14:25:29 2017 -0700
committer Jordan Liu <jminjie@google.com> Wed Apr 19 14:40:23 2017 -0700
tree 4e84ea4e3a30f539546a6b66218f28c70daea743
parent f9f8120e56caf757e4a995c6a62273f9210c041d

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

telephony/java/android/telephony/Telephony.java

diff --git a/telephony/java/android/telephony/Telephony.java b/telephony/java/android/telephony/Telephony.java
index eeaf2c1..3282f5f 100644
--- a/telephony/java/android/telephony/Telephony.java
+++ b/telephony/java/android/telephony/Telephony.java
@@ -3008,12 +3008,12 @@
          * 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 @@
          * 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();
         }
 
         /**