diff options
3 files changed, 16 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/IntRangeManager.java b/telephony/java/com/android/internal/telephony/IntRangeManager.java index 970bc4424fba..cc7774d66c3e 100644 --- a/telephony/java/com/android/internal/telephony/IntRangeManager.java +++ b/telephony/java/com/android/internal/telephony/IntRangeManager.java @@ -543,6 +543,14 @@ public abstract class IntRangeManager { } /** + * 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 * a call to {@link #finishUpdate}. diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index 8aae0d428130..63c22e6d94da 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -1928,7 +1928,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { if (RILJ_LOGD) { riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) - + " with " + numOfConfig + "configs : "); + + " with " + numOfConfig + " configs : "); for (int i = 0; i < numOfConfig; i++) { riljLog(config[i].toString()); } diff --git a/telephony/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java b/telephony/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java index 8d0e5d3eefda..92bf390361a6 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java +++ b/telephony/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java @@ -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); } } } |