commit 50bab9e08bd11d2fc24c38780312f7bb0d9e0b14
author Wink Saville <wink@google.com> Tue Jan 13 19:09:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 13 19:09:51 2015 +0000
tree f351633ecafdf0dc3ac6aa297faba6a73d353dfb
parent 45bb5e99227a24a8f9075c4d9c7889ac0c7c7bb4
parent 4905119d65ab4cb153e139368690f2c386507447

am 4905119d: Rename reg/unreg OnSubscriptionsChangedListener.

* commit '4905119d65ab4cb153e139368690f2c386507447':
  Rename reg/unreg OnSubscriptionsChangedListener.

api/22.txt

diff --git a/api/22.txt b/api/22.txt
index 1f86b03..64a16eb 100644
--- a/api/22.txt
+++ b/api/22.txt
@@ -28541,6 +28541,7 @@
     field public static final int MMS_ERROR_HTTP_FAILURE = 4; // 0x4
     field public static final int MMS_ERROR_INVALID_APN = 2; // 0x2
     field public static final int MMS_ERROR_IO_ERROR = 5; // 0x5
+    field public static final int MMS_ERROR_NO_DATA_NETWORK = 8; // 0x8
     field public static final int MMS_ERROR_RETRY = 6; // 0x6
     field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3
     field public static final int MMS_ERROR_UNSPECIFIED = 1; // 0x1
@@ -28633,6 +28634,7 @@
   }
 
   public class SubscriptionManager {
+    method public void addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
     method public static android.telephony.SubscriptionManager from(android.content.Context);
     method public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
     method public int getActiveSubscriptionInfoCount();
@@ -28640,8 +28642,7 @@
     method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);
     method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
     method public boolean isNetworkRoaming(int);
-    method public void registerOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
-    method public void unregisterOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
+    method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
   }
 
   public static class SubscriptionManager.OnSubscriptionsChangedListener {