am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0 (e3a31d03) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/IntRangeManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -542,6 +542,14 @@ public abstract class IntRangeManager {
		return finishUpdate();
		}

		/**
		* Returns whether the list of ranges is completely empty.
		* @return true if there are no enabled ranges
		*/
		public boolean isEmpty() {
		return mRanges.isEmpty();
		}

		/**
		* Called when the list of enabled ranges has changed. This will be
		* followed by zero or more calls to {@link #addRange} followed by

+7 −2

Original line number	Diff line number	Diff line
		@@ -246,6 +246,8 @@ public class SimSmsInterfaceManager extends IccSmsInterfaceManager {
		log("Added cell broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);

		setCellBroadcastActivation(!mCellBroadcastRangeManager.isEmpty());

		return true;
		}

		@@ -271,6 +273,8 @@ public class SimSmsInterfaceManager extends IccSmsInterfaceManager {
		log("Removed cell broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);

		setCellBroadcastActivation(!mCellBroadcastRangeManager.isEmpty());

		return true;
		}

		@@ -301,14 +305,15 @@ public class SimSmsInterfaceManager extends IccSmsInterfaceManager {
		/**
		* Called to indicate the end of a range update started by the
		* previous call to {@link #startUpdate}.
		* @return true if successful, false otherwise
		*/
		protected boolean finishUpdate() {
		if (mConfigList.isEmpty()) {
		return setCellBroadcastActivation(false);
		return true;
		} else {
		SmsBroadcastConfigInfo[] configs =
		mConfigList.toArray(new SmsBroadcastConfigInfo[mConfigList.size()]);
		return setCellBroadcastConfig(configs) && setCellBroadcastActivation(true);
		return setCellBroadcastConfig(configs);
		}
		}
		}

+1 −1

File changed.

Contains only whitespace changes.