Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev

Browse Source
This commit is contained in:
Wink Saville
2015-01-13 19:02:06 +00:00
committed by Android (Google) Code Review
parent 9320e9f0a6 071743f0cb
commit 84c5e8ebf0
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -28634,6 +28634,7 @@ package android.telephony {
} }
public class SubscriptionManager { public class SubscriptionManager {
method public void addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
method public static android.telephony.SubscriptionManager from(android.content.Context); method public static android.telephony.SubscriptionManager from(android.content.Context);
method public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int); method public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
method public int getActiveSubscriptionInfoCount(); method public int getActiveSubscriptionInfoCount();
@@ -28641,8 +28642,7 @@ package android.telephony {
method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int); method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);
method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList(); method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
method public boolean isNetworkRoaming(int); method public boolean isNetworkRoaming(int);
method public void registerOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
method public void unregisterOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
} }
public static class SubscriptionManager.OnSubscriptionsChangedListener { public static class SubscriptionManager.OnSubscriptionsChangedListener {

2
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -705,7 +705,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
context.registerReceiverAsUser(mBroadcastAllReceiver, UserHandle.ALL, allUserFilter, context.registerReceiverAsUser(mBroadcastAllReceiver, UserHandle.ALL, allUserFilter,
null, null); null, null);
mSubscriptionManager.registerOnSubscriptionsChangedListener(mSubscriptionListener); mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener);
try { try {
ActivityManagerNative.getDefault().registerUserSwitchObserver( ActivityManagerNative.getDefault().registerUserSwitchObserver(
new IUserSwitchObserver.Stub() { new IUserSwitchObserver.Stub() {

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -195,7 +195,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) { for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) {
mobileSignalController.registerListener(); mobileSignalController.registerListener();
} }
mSubscriptionManager.registerOnSubscriptionsChangedListener(mSubscriptionListener); mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener);
// broadcasts // broadcasts
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
@@ -221,7 +221,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) { for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) {
mobileSignalController.unregisterListener(); mobileSignalController.unregisterListener();
} }
mSubscriptionManager.unregisterOnSubscriptionsChangedListener(mSubscriptionListener); mSubscriptionManager.removeOnSubscriptionsChangedListener(mSubscriptionListener);
mContext.unregisterReceiver(this); mContext.unregisterReceiver(this);
} }

4
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -338,7 +338,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
@Override @Override
public void registerOnSubscriptionsChangedListener(String pkgForDebug, public void addOnSubscriptionsChangedListener(String pkgForDebug,
IOnSubscriptionsChangedListener callback) { IOnSubscriptionsChangedListener callback) {
int callerUid = UserHandle.getCallingUserId(); int callerUid = UserHandle.getCallingUserId();
int myUid = UserHandle.myUserId(); int myUid = UserHandle.myUserId();
@@ -393,7 +393,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
@Override @Override
public void unregisterOnSubscriptionsChangedListener(String pkgForDebug, public void removeOnSubscriptionsChangedListener(String pkgForDebug,
IOnSubscriptionsChangedListener callback) { IOnSubscriptionsChangedListener callback) {
if (DBG) log("listen oscl: Unregister"); if (DBG) log("listen oscl: Unregister");
remove(callback.asBinder()); remove(callback.asBinder());

2
services/core/java/com/android/server/location/GpsLocationProvider.java
View File

@@ -648,7 +648,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
// Register for SubscriptionInfo list changes which is guaranteed // Register for SubscriptionInfo list changes which is guaranteed
// to invoke onSubscriptionsChanged the first time. // to invoke onSubscriptionsChanged the first time.
SubscriptionManager.from(mContext) SubscriptionManager.from(mContext)
.registerOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener); .addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);
// construct handler, listen for events // construct handler, listen for events
mHandler = new ProviderHandler(looper); mHandler = new ProviderHandler(looper);

12
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -266,9 +266,9 @@ public class SubscriptionManager {
* A listener class for monitoring changes to {@link SubscriptionInfo} records. * A listener class for monitoring changes to {@link SubscriptionInfo} records.
* <p> * <p>
* Override the onSubscriptionsChanged method in the object that extends this * 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 * to register your listener and to unregister invoke
* {@link #unregisterOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)} * {@link #removeOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)}
* <p> * <p>
* Permissions android.Manifest.permission.READ_PHONE_STATE is required * Permissions android.Manifest.permission.READ_PHONE_STATE is required
* for #onSubscriptionsChanged to be invoked. * for #onSubscriptionsChanged to be invoked.
@@ -340,7 +340,7 @@ public class SubscriptionManager {
* @param listener an instance of {@link OnSubscriptionsChangedListener} with * @param listener an instance of {@link OnSubscriptionsChangedListener} with
* onSubscriptionsChanged overridden. * onSubscriptionsChanged overridden.
*/ */
public void registerOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) { public void addOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) {
String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>"; String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>";
if (DBG) { if (DBG) {
logd("register OnSubscriptionsChangedListener pkgForDebug=" + pkgForDebug logd("register OnSubscriptionsChangedListener pkgForDebug=" + pkgForDebug
@@ -352,7 +352,7 @@ public class SubscriptionManager {
ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService( ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService(
"telephony.registry")); "telephony.registry"));
if (tr != null) { if (tr != null) {
tr.registerOnSubscriptionsChangedListener(pkgForDebug, listener.callback); tr.addOnSubscriptionsChangedListener(pkgForDebug, listener.callback);
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
// Should not happen // Should not happen
@@ -366,7 +366,7 @@ public class SubscriptionManager {
* *
* @param listener that is to be unregistered. * @param listener that is to be unregistered.
*/ */
public void unregisterOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) { public void removeOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) {
String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>"; String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>";
if (DBG) { if (DBG) {
logd("unregister OnSubscriptionsChangedListener pkgForDebug=" + pkgForDebug logd("unregister OnSubscriptionsChangedListener pkgForDebug=" + pkgForDebug
@@ -378,7 +378,7 @@ public class SubscriptionManager {
ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService( ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService(
"telephony.registry")); "telephony.registry"));
if (tr != null) { if (tr != null) {
tr.unregisterOnSubscriptionsChangedListener(pkgForDebug, listener.callback); tr.removeOnSubscriptionsChangedListener(pkgForDebug, listener.callback);
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
// Should not happen // Should not happen

4
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
View File

@@ -30,9 +30,9 @@ import com.android.internal.telephony.IPhoneStateListener;
import com.android.internal.telephony.IOnSubscriptionsChangedListener; import com.android.internal.telephony.IOnSubscriptionsChangedListener;
interface ITelephonyRegistry { interface ITelephonyRegistry {
void registerOnSubscriptionsChangedListener(String pkg, void addOnSubscriptionsChangedListener(String pkg,
IOnSubscriptionsChangedListener callback); IOnSubscriptionsChangedListener callback);
void unregisterOnSubscriptionsChangedListener(String pkg, void removeOnSubscriptionsChangedListener(String pkg,
IOnSubscriptionsChangedListener callback); IOnSubscriptionsChangedListener callback);
void listen(String pkg, IPhoneStateListener callback, int events, boolean notifyNow); void listen(String pkg, IPhoneStateListener callback, int events, boolean notifyNow);
void listenForSubscriber(in int subId, String pkg, IPhoneStateListener callback, int events, void listenForSubscriber(in int subId, String pkg, IPhoneStateListener callback, int events,