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

Commit 4581e809 authored by Jack Yu's avatar Jack Yu
Browse files

Reset cell broadcast config before enabling all channels 

Before cell broadcast config service enabling all channels, it
reset all channels that were previously enabled. This will make
sure the full channel config can be pushed down to modem. This
also solved the issue that channel config not sending to modem
when SIM is swapped. Note that a hidden API is added and will
be unhide in the next Android release.

Fix: 155027085
Test: Manual
Change-Id: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
parent 1d9d0b9d

telephony/java/android/telephony/SmsManager.java

+25 −0
Original line number Diff line number Diff line
@@ -2978,4 +2978,29 @@ public final class SmsManager { 
            Log.e(TAG, "setPremiumSmsPermission() RemoteException", e);

        }

    }



    /**

     * Reset all cell broadcast ranges. Previously enabled ranges will become invalid after this.

     *

     * @return {@code true} if succeeded, otherwise {@code false}.

     *

     * // TODO: Unhide the API in S.

     * @hide

     */

    public boolean resetAllCellBroadcastRanges() {

        boolean success = false;



        try {

            ISms iSms = getISmsService();

            if (iSms != null) {

                // If getSubscriptionId() returns INVALID or an inactive subscription, we will use

                // the default phone internally.

                success = iSms.resetAllCellBroadcastRanges(getSubscriptionId());

            }

        } catch (RemoteException ex) {

            // ignore it

        }



        return success;

    }

}

telephony/java/com/android/internal/telephony/ISms.aidl

+10 −0
Original line number Diff line number Diff line
@@ -563,4 +563,14 @@ interface ISms { 
     * @return capacity of ICC

     */

    int getSmsCapacityOnIccForSubscriber(int subId);



    /**

     * Reset all cell broadcast ranges. Previously enabled ranges will become invalid after this.

     *

     * @param subId Subscription index

     * @return {@code true} if succeeded, otherwise {@code false}.

     *

     * @hide

     */

    boolean resetAllCellBroadcastRanges(int subId);

}

telephony/java/com/android/internal/telephony/ISmsImplBase.java

+5 −0
Original line number Diff line number Diff line
@@ -212,4 +212,9 @@ public class ISmsImplBase extends ISms.Stub { 
    public int getSmsCapacityOnIccForSubscriber(int subId) {

        throw new UnsupportedOperationException();

    }



    @Override

    public boolean resetAllCellBroadcastRanges(int subId) {

        throw new UnsupportedOperationException();

    }

}