commit f67832f67f330e645ea6109feb108bf7dd854155
author Wink Saville <wink@google.com> Mon Jan 12 16:51:50 2015 -0800
committer Wink Saville <wink@google.com> Tue Jan 13 08:36:25 2015 -0800
tree d1964705611fafff818d80f4a70f209f9a20d746
parent 31a0c71081d871b3162413c050188921498fff50

Rename reg/unreg OnSubscriptionsChangedListener.

To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 3669544..bc0e584 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -163,7 +163,7 @@
                     BluetoothProfile.HEADSET);
         }
 
-        mSubscriptionManager.registerOnSubscriptionsChangedListener(
+        mSubscriptionManager.addOnSubscriptionsChangedListener(
                 new OnSubscriptionsChangedListener() {
                     @Override
                     public void onSubscriptionsChanged() {

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 02b4a72..d00ff9f 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -508,7 +508,7 @@
                 && ImsManager.isNonTtyOrTtyOnVolteEnabled(this));
         // NOTE: The button will be enabled/disabled in mPhoneStateListener
 
-        mSubscriptionManager.registerOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
+        mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
 
         if (DBG) log("onResume:-");
 
@@ -742,7 +742,7 @@
         }
 
         mSubscriptionManager
-            .unregisterOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
+            .removeOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
         if (DBG) log("onPause:-");
     }
 

src/com/android/services/telephony/TelecomAccountRegistry.java

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 37e8147..6a533ef 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -229,7 +229,7 @@
 
         // Register for SubscriptionInfo list changes which is guaranteed
         // to invoke onSubscriptionsChanged the first time.
-        SubscriptionManager.from(mContext).registerOnSubscriptionsChangedListener(
+        SubscriptionManager.from(mContext).addOnSubscriptionsChangedListener(
                 mOnSubscriptionsChangedListener);
 
         // We also need to listen for changes to the service state (e.g. emergency -> in service)