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

Commit 946410ee authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Use SubscriptionId instead of SubId"

parents 112d039d 786b15c0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -33650,8 +33650,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";
+2 −2
Original line number Diff line number Diff line
@@ -36494,8 +36494,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";
+2 −2
Original line number Diff line number Diff line
@@ -33731,8 +33731,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";