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

Commit 9cad054e authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Use SubscriptionId instead of SubId" 

am: 946410ee

Change-Id: Ib6f689a69ff19b24cc5ac128e77254c0d7624161
parents 03f4a0f0 946410ee

api/current.txt

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

























api/system-current.txt



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

























api/test-current.txt



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