diff options
7 files changed, 16 insertions, 16 deletions
diff --git a/api/current.txt b/api/current.txt index 24501f352609..64a16eb37bfb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28634,6 +28634,7 @@ package android.telephony { } 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(); @@ -28641,8 +28642,7 @@ package android.telephony { 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 { diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 84bacc33404b..48f2e42ac584 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -705,7 +705,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { context.registerReceiverAsUser(mBroadcastAllReceiver, UserHandle.ALL, allUserFilter, null, null); - mSubscriptionManager.registerOnSubscriptionsChangedListener(mSubscriptionListener); + mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener); try { ActivityManagerNative.getDefault().registerUserSwitchObserver( new IUserSwitchObserver.Stub() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 3cd0e64ce2c3..6d38d38816a0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -195,7 +195,7 @@ public class NetworkControllerImpl extends BroadcastReceiver for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) { mobileSignalController.registerListener(); } - mSubscriptionManager.registerOnSubscriptionsChangedListener(mSubscriptionListener); + mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener); // broadcasts IntentFilter filter = new IntentFilter(); @@ -221,7 +221,7 @@ public class NetworkControllerImpl extends BroadcastReceiver for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) { mobileSignalController.unregisterListener(); } - mSubscriptionManager.unregisterOnSubscriptionsChangedListener(mSubscriptionListener); + mSubscriptionManager.removeOnSubscriptionsChangedListener(mSubscriptionListener); mContext.unregisterReceiver(this); } diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 72c2eaf15de3..8d7a182d5669 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -338,7 +338,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { } @Override - public void registerOnSubscriptionsChangedListener(String pkgForDebug, + public void addOnSubscriptionsChangedListener(String pkgForDebug, IOnSubscriptionsChangedListener callback) { int callerUid = UserHandle.getCallingUserId(); int myUid = UserHandle.myUserId(); @@ -393,7 +393,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { } @Override - public void unregisterOnSubscriptionsChangedListener(String pkgForDebug, + public void removeOnSubscriptionsChangedListener(String pkgForDebug, IOnSubscriptionsChangedListener callback) { if (DBG) log("listen oscl: Unregister"); remove(callback.asBinder()); diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java index 9c0f9874b5bc..bec0e22d446b 100644 --- a/services/core/java/com/android/server/location/GpsLocationProvider.java +++ b/services/core/java/com/android/server/location/GpsLocationProvider.java @@ -648,7 +648,7 @@ public class GpsLocationProvider implements LocationProviderInterface { // Register for SubscriptionInfo list changes which is guaranteed // to invoke onSubscriptionsChanged the first time. SubscriptionManager.from(mContext) - .registerOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener); + .addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener); // construct handler, listen for events mHandler = new ProviderHandler(looper); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index d174f47447c3..9ef6f1f9dd96 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -266,9 +266,9 @@ public class SubscriptionManager { * A listener class for monitoring changes to {@link SubscriptionInfo} records. * <p> * Override the onSubscriptionsChanged method in the object that extends this - * class and pass it to {@link #registerOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)} + * class and pass it to {@link #addOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)} * to register your listener and to unregister invoke - * {@link #unregisterOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)} + * {@link #removeOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)} * <p> * Permissions android.Manifest.permission.READ_PHONE_STATE is required * for #onSubscriptionsChanged to be invoked. @@ -340,7 +340,7 @@ public class SubscriptionManager { * @param listener an instance of {@link OnSubscriptionsChangedListener} with * onSubscriptionsChanged overridden. */ - public void registerOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) { + public void addOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) { String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>"; if (DBG) { logd("register OnSubscriptionsChangedListener pkgForDebug=" + pkgForDebug @@ -352,7 +352,7 @@ public class SubscriptionManager { ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService( "telephony.registry")); if (tr != null) { - tr.registerOnSubscriptionsChangedListener(pkgForDebug, listener.callback); + tr.addOnSubscriptionsChangedListener(pkgForDebug, listener.callback); } } catch (RemoteException ex) { // Should not happen @@ -366,7 +366,7 @@ public class SubscriptionManager { * * @param listener that is to be unregistered. */ - public void unregisterOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) { + public void removeOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) { String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>"; if (DBG) { logd("unregister OnSubscriptionsChangedListener pkgForDebug=" + pkgForDebug @@ -378,7 +378,7 @@ public class SubscriptionManager { ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService( "telephony.registry")); if (tr != null) { - tr.unregisterOnSubscriptionsChangedListener(pkgForDebug, listener.callback); + tr.removeOnSubscriptionsChangedListener(pkgForDebug, listener.callback); } } catch (RemoteException ex) { // Should not happen diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index ba62f5f1594d..7d8a8d66582e 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -30,9 +30,9 @@ import com.android.internal.telephony.IPhoneStateListener; import com.android.internal.telephony.IOnSubscriptionsChangedListener; interface ITelephonyRegistry { - void registerOnSubscriptionsChangedListener(String pkg, + void addOnSubscriptionsChangedListener(String pkg, IOnSubscriptionsChangedListener callback); - void unregisterOnSubscriptionsChangedListener(String pkg, + void removeOnSubscriptionsChangedListener(String pkg, IOnSubscriptionsChangedListener callback); void listen(String pkg, IPhoneStateListener callback, int events, boolean notifyNow); void listenForSubscriber(in int subId, String pkg, IPhoneStateListener callback, int events, |