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

Commit f044a370 authored by Jake Hamby's avatar Jake Hamby
Browse files

Fix bug in enabling/disabling SMS cell broadcast activation. 

When enabling/disabling SMS cell broadcast channels, we were not calling
setGsmBroadcastActivation() with the correct value after updating the
message IDs. It should be called with true if any message IDs are enabled,
or false if the list is empty.

Added an isEmpty() method to IntRangeManager, and moved the call to
setGsmBroadcastActivation() in SimSmsInterfaceManager to the end of the
enableCellBroadcastRange() and disableCellBroadcastRange() methods,
where it sets the correct value using the new isEmpty() method to test
if there are any message IDs enabled after updating the range list.

Bug: 5525441
Change-Id: I7d1ebd54dacf1de20910947efbf5e87e1957fd1a
parent 8d059ac5

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

telephony/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java

+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);

            }

        }

    }

telephony/java/com/android/internal/telephony/RIL.java

+1 −1

File changed.

Contains only whitespace changes.