commit fb0acf335536054a1660e2a72d877a19b8d75f35
author Jordan Liu <jminjie@google.com> Fri Apr 21 18:30:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 21 18:30:29 2017 +0000
tree d37b5fb70613be6b1978363a13db109ea97bcc6b
parent 96b140489c129c3085cc866c830b91c1adb0c86e
parent 9cad054e02cb5c36da968e0fedf2159c66636a50

Merge "Use SubscriptionId instead of SubId" am: 946410eef5
am: 9cad054e02

Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 883d986..0adac70 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -33650,8 +33650,8 @@
   }
 
   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

diff --git a/api/system-current.txt b/api/system-current.txt
index 3b61bdd..8970a3e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -36494,8 +36494,8 @@
   }
 
   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

diff --git a/api/test-current.txt b/api/test-current.txt
index 61a65d8..9ea0b52 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -33731,8 +33731,8 @@
   }
 
   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";