Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a903c31 authored Jan 13, 2015 by Wink Saville Committed by Android Git Automerger Jan 13, 2015

am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev

* commit '84c5e8eb':
  Rename reg/unreg OnSubscriptionsChangedListener.

parents e036ce2e 84c5e8eb

api/current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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 {

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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() {

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}

services/core/java/com/android/server/TelephonyRegistry.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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());

services/core/java/com/android/server/location/GpsLocationProvider.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);