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

Commit 0f332523 authored by Jordan Liu's avatar Jordan Liu
Browse files

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
parent f9f8120e

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -35451,8 +35451,8 @@ package android.provider { 
  }

  }

















  public static final class Telephony.ServiceStateTable {







  public static final class Telephony.ServiceStateTable {











    method public static android.net.Uri getUriForSubId(int);







    method public static android.net.Uri getUriForSubscriptionId(int);











    method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String);







    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 java.lang.String AUTHORITY = "service-state";











    field public static final android.net.Uri CONTENT_URI;







    field public static final android.net.Uri CONTENT_URI;











    field public static final java.lang.String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";







    field public static final java.lang.String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";

























api/system-current.txt



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -38552,8 +38552,8 @@ package android.provider {









  }







  }



























  public static final class Telephony.ServiceStateTable {







  public static final class Telephony.ServiceStateTable {











    method public static android.net.Uri getUriForSubId(int);







    method public static android.net.Uri getUriForSubscriptionId(int);











    method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String);







    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 java.lang.String AUTHORITY = "service-state";











    field public static final android.net.Uri CONTENT_URI;







    field public static final android.net.Uri CONTENT_URI;











    field public static final java.lang.String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";







    field public static final java.lang.String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";

























api/test-current.txt



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -35591,8 +35591,8 @@ package android.provider {









  }







  }



























  public static final class Telephony.ServiceStateTable {







  public static final class Telephony.ServiceStateTable {











    method public static android.net.Uri getUriForSubId(int);







    method public static android.net.Uri getUriForSubscriptionId(int);











    method public static android.net.Uri getUriForSubIdAndField(int, java.lang.String);







    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 java.lang.String AUTHORITY = "service-state";











    field public static final android.net.Uri CONTENT_URI;







    field public static final android.net.Uri CONTENT_URI;











    field public static final java.lang.String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";







    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
Original line
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







         * Note, however, that using a {@link JobService} does not guarantee timely delivery of











         * updates to the {@link Uri}.







         * 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







         * @param field the ServiceState field to receive updates on











         * @return the Uri used to observe {@link ServiceState} changes







         * @return the Uri used to observe {@link ServiceState} changes











         */







         */











        public static Uri getUriForSubIdAndField(int subId, String field) {







        public static Uri getUriForSubscriptionIdAndField(int subscriptionId, String field) {











            return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subId))







            return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subscriptionId))











                    .appendEncodedPath(field).build();







                    .appendEncodedPath(field).build();











        }







        }





























@@ -3027,11 +3027,11 @@ public final class Telephony {









         * Note, however, that using a {@link JobService} does not guarantee timely delivery of







         * Note, however, that using a {@link JobService} does not guarantee timely delivery of











         * updates to the {@link Uri}.







         * 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







         * @return the Uri used to observe {@link ServiceState} changes











         */







         */











        public static Uri getUriForSubId(int subId) {







        public static Uri getUriForSubscriptionId(int subscriptionId) {











            return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subId)).build();







            return CONTENT_URI.buildUpon().appendEncodedPath(String.valueOf(subscriptionId)).build();











        }







        }































        /**







        /**