Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8079a69e authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

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

parents bd3d0dea 0f332523

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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";

























api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -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";

























api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -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";

























telephony/java/android/telephony/Telephony.java



+6
−6




























Original line number
Diff line number
Diff line








@@ -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();















        }































        /**