Merge "Post notifications per subid" into pi-dev (02f6fc53) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ServiceStateTracker.java

+17 −12

Original line number	Original line	Diff line number	Diff line
	@@ -279,6 +279,7 @@ public class ServiceStateTracker extends Handler {
	if (DBG) log("SubscriptionListener.onSubscriptionInfoChanged");		if (DBG) log("SubscriptionListener.onSubscriptionInfoChanged");
	// Set the network type, in case the radio does not restore it.		// Set the network type, in case the radio does not restore it.
	int subId = mPhone.getSubId();		int subId = mPhone.getSubId();
			ServiceStateTracker.this.mPrevSubId = mPreviousSubId.get();
	if (mPreviousSubId.getAndSet(subId) != subId) {		if (mPreviousSubId.getAndSet(subId) != subId) {
	if (SubscriptionManager.isValidSubscriptionId(subId)) {		if (SubscriptionManager.isValidSubscriptionId(subId)) {
	Context context = mPhone.getContext();		Context context = mPhone.getContext();
	@@ -1064,7 +1065,9 @@ public class ServiceStateTracker extends Handler {
	case EVENT_SIM_READY:		case EVENT_SIM_READY:
	// Reset the mPreviousSubId so we treat a SIM power bounce		// Reset the mPreviousSubId so we treat a SIM power bounce
	// as a first boot. See b/19194287		// as a first boot. See b/19194287
	mOnSubscriptionsChangedListener.mPreviousSubId.set(-1);		mOnSubscriptionsChangedListener.mPreviousSubId.set(
			SubscriptionManager.INVALID_SUBSCRIPTION_ID);
			mPrevSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
	mIsSimReady = true;		mIsSimReady = true;
	pollState();		pollState();
	// Signal strength polling stops when radio is off		// Signal strength polling stops when radio is off
	@@ -3471,17 +3474,19 @@ public class ServiceStateTracker extends Handler {
	}		}

	/**		/**
	* Cancels all notifications posted to NotificationManager. These notifications for restricted		* Cancels all notifications posted to NotificationManager for this subId. These notifications
	* state and rejection cause for cs registration are no longer valid after the SIM has been		* for restricted state and rejection cause for cs registration are no longer valid after the
	* removed.		* SIM has been removed.
	*/		*/
	private void cancelAllNotifications() {		private void cancelAllNotifications() {
	if (DBG) log("setNotification: cancelAllNotifications");		if (DBG) log("cancelAllNotifications: mPrevSubId=" + mPrevSubId);
	NotificationManager notificationManager = (NotificationManager)		NotificationManager notificationManager = (NotificationManager)
	mPhone.getContext().getSystemService(Context.NOTIFICATION_SERVICE);		mPhone.getContext().getSystemService(Context.NOTIFICATION_SERVICE);
	notificationManager.cancel(PS_NOTIFICATION);		if (SubscriptionManager.isValidSubscriptionId(mPrevSubId)) {
	notificationManager.cancel(CS_NOTIFICATION);		notificationManager.cancel(Integer.toString(mPrevSubId), PS_NOTIFICATION);
	notificationManager.cancel(CS_REJECT_CAUSE_NOTIFICATION);		notificationManager.cancel(Integer.toString(mPrevSubId), CS_NOTIFICATION);
			notificationManager.cancel(Integer.toString(mPrevSubId), CS_REJECT_CAUSE_NOTIFICATION);
			}
	}		}

	/**		/**
	@@ -3596,7 +3601,7 @@ public class ServiceStateTracker extends Handler {

	if (DBG) {		if (DBG) {
	log("setNotification, create notification, notifyType: " + notifyType		log("setNotification, create notification, notifyType: " + notifyType
	+ ", title: " + title + ", details: " + details);		+ ", title: " + title + ", details: " + details + ", subId: " + mSubId);
	}		}

	mNotification = new Notification.Builder(context)		mNotification = new Notification.Builder(context)
	@@ -3617,7 +3622,7 @@ public class ServiceStateTracker extends Handler {

	if (notifyType == PS_DISABLED \|\| notifyType == CS_DISABLED) {		if (notifyType == PS_DISABLED \|\| notifyType == CS_DISABLED) {
	// cancel previous post notification		// cancel previous post notification
	notificationManager.cancel(notificationId);		notificationManager.cancel(Integer.toString(mSubId), notificationId);
	} else {		} else {
	boolean show = false;		boolean show = false;
	if (mNewSS.isEmergencyOnly() && notifyType == CS_EMERGENCY_ENABLED) {		if (mNewSS.isEmergencyOnly() && notifyType == CS_EMERGENCY_ENABLED) {
	@@ -3632,9 +3637,9 @@ public class ServiceStateTracker extends Handler {
	// issue if phone go to OOS and camp to other networks and received restricted ind.		// issue if phone go to OOS and camp to other networks and received restricted ind.
	show = true;		show = true;
	}		}
	// update restricted state notification		// update restricted state notification for this subId
	if (show) {		if (show) {
	notificationManager.notify(notificationId, mNotification);		notificationManager.notify(Integer.toString(mSubId), notificationId, mNotification);
	}		}
	}		}
	}		}