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

Commit 54fa5c23 authored by xinhe's avatar xinhe Committed by Android (Google) Code Review
Browse files

Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev

parents 3b225692 a8064ed9

src/java/android/telephony/SmsManager.java

+44 −23
Original line number Diff line number Diff line
@@ -65,7 +65,10 @@ public final class SmsManager { 
    private static final SmsManager sInstance = new SmsManager(DEFAULT_SUB_ID);

    private static final Object sLockObject = new Object();

    private static final Map<Integer, SmsManager> sSubInstances = new ArrayMap<Integer, SmsManager>();



    /** @hide */

    public static final int CELL_BROADCAST_RAN_TYPE_GSM = 0;

    /** @hide */

    public static final int CELL_BROADCAST_RAN_TYPE_CDMA = 1;

    /** A concrete subId, or the pseudo DEFAULT_SUB_ID */

    private int mSubId;
@@ -644,8 +647,9 @@ public final class SmsManager { 


    /**

     * Enable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier. Note that if two different clients enable the same

     * message identifier, they must both disable it for the device to stop

     * message identifier and RAN type. The RAN type specify this message ID

     * belong to 3GPP (GSM) or 3GPP2(CDMA).Note that if two different clients

     * enable the same message identifier, they must both disable it for the device to stop

     * receiving those messages. All received messages will be broadcast in an

     * intent with the action "android.provider.Telephony.SMS_CB_RECEIVED".

     * Note: This call is blocking, callers may want to avoid calling it from
@@ -653,18 +657,22 @@ public final class SmsManager { 
     *

     * @param messageIdentifier Message identifier as specified in TS 23.041 (3GPP)

     * or C.R1001-G (3GPP2)

     * @param ranType as defined in class SmsManager, the value can be one of these:

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     * @see #disableCellBroadcast(int)

     * @see #disableCellBroadcast(int, int)

     *

     * {@hide}

     */

    public boolean enableCellBroadcast(int messageIdentifier) {

    public boolean enableCellBroadcast(int messageIdentifier, int ranType) {

        boolean success = false;



        try {

            ISms iccISms = getISmsService();

            if (iccISms != null) {

                success = iccISms.enableCellBroadcastForSubscriber(getSubId(), messageIdentifier);

                success = iccISms.enableCellBroadcastForSubscriber(getSubId(), messageIdentifier,

                        ranType);

            }

        } catch (RemoteException ex) {

            // ignore it
@@ -675,27 +683,32 @@ public final class SmsManager { 


    /**

     * Disable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier. Note that if two different clients enable the same

     * message identifier, they must both disable it for the device to stop

     * receiving those messages.

     * message identifier and RAN type. The RAN type specify this message ID

     * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients

     * enable the same message identifier, they must both disable it for the

     * device to stop receiving those messages.

     * Note: This call is blocking, callers may want to avoid calling it from

     * the main thread of an application.

     *

     * @param messageIdentifier Message identifier as specified in TS 23.041 (3GPP)

     * or C.R1001-G (3GPP2)

     * @param ranType as defined in class SmsManager, the value can be one of these:

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #enableCellBroadcast(int)

     * @see #enableCellBroadcast(int, int)

     *

     * {@hide}

     */

    public boolean disableCellBroadcast(int messageIdentifier) {

    public boolean disableCellBroadcast(int messageIdentifier, int ranType) {

        boolean success = false;



        try {

            ISms iccISms = getISmsService();

            if (iccISms != null) {

                success = iccISms.disableCellBroadcastForSubscriber(getSubId(), messageIdentifier);

                success = iccISms.disableCellBroadcastForSubscriber(getSubId(), messageIdentifier,

                        ranType);

            }

        } catch (RemoteException ex) {

            // ignore it
@@ -706,8 +719,9 @@ public final class SmsManager { 


    /**

     * Enable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier range. Note that if two different clients enable the same

     * message identifier, they must both disable it for the device to stop

     * message identifier range and RAN type. The RAN type specify this message ID

     * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients enable

     * the same message identifier, they must both disable it for the device to stop

     * receiving those messages. All received messages will be broadcast in an

     * intent with the action "android.provider.Telephony.SMS_CB_RECEIVED".

     * Note: This call is blocking, callers may want to avoid calling it from
@@ -717,13 +731,16 @@ public final class SmsManager { 
     * or C.R1001-G (3GPP2)

     * @param endMessageId last message identifier as specified in TS 23.041 (3GPP)

     * or C.R1001-G (3GPP2)

     * @param ranType as defined in class SmsManager, the value can be one of these:

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     * @see #disableCellBroadcastRange(int, int)

     * @see #disableCellBroadcastRange(int, int, int)

     *

     * @throws IllegalArgumentException if endMessageId < startMessageId

     * {@hide}

     */

    public boolean enableCellBroadcastRange(int startMessageId, int endMessageId) {

    public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {

        boolean success = false;



        if (endMessageId < startMessageId) {
@@ -733,7 +750,7 @@ public final class SmsManager { 
            ISms iccISms = getISmsService();

            if (iccISms != null) {

                success = iccISms.enableCellBroadcastRangeForSubscriber(getSubId(),

                        startMessageId, endMessageId);

                        startMessageId, endMessageId, ranType);

            }

        } catch (RemoteException ex) {

            // ignore it
@@ -744,9 +761,10 @@ public final class SmsManager { 


    /**

     * Disable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier range. Note that if two different clients enable the same

     * message identifier, they must both disable it for the device to stop

     * receiving those messages.

     * message identifier range and RAN type. The RAN type specify this message

     * ID range belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different

     * clients enable the same message identifier, they must both disable it for

     * the device to stop receiving those messages.

     * Note: This call is blocking, callers may want to avoid calling it from

     * the main thread of an application.

     *
@@ -754,14 +772,17 @@ public final class SmsManager { 
     * or C.R1001-G (3GPP2)

     * @param endMessageId last message identifier as specified in TS 23.041 (3GPP)

     * or C.R1001-G (3GPP2)

     * @param ranType as defined in class SmsManager, the value can be one of these:

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #enableCellBroadcastRange(int, int)

     * @see #enableCellBroadcastRange(int, int, int)

     *

     * @throws IllegalArgumentException if endMessageId < startMessageId

     * {@hide}

     */

    public boolean disableCellBroadcastRange(int startMessageId, int endMessageId) {

    public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {

        boolean success = false;



        if (endMessageId < startMessageId) {
@@ -771,7 +792,7 @@ public final class SmsManager { 
            ISms iccISms = getISmsService();

            if (iccISms != null) {

                success = iccISms.disableCellBroadcastRangeForSubscriber(getSubId(),

                        startMessageId, endMessageId);

                        startMessageId, endMessageId, ranType);

            }

        } catch (RemoteException ex) {

            // ignore it

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

+18 −14
Original line number Diff line number Diff line
@@ -579,27 +579,31 @@ public class IccSmsInterfaceManager { 
        return data;

    }



    public boolean enableCellBroadcast(int messageIdentifier) {

        return enableCellBroadcastRange(messageIdentifier, messageIdentifier);

    public boolean enableCellBroadcast(int messageIdentifier, int ranType) {

        return enableCellBroadcastRange(messageIdentifier, messageIdentifier, ranType);

    }



    public boolean disableCellBroadcast(int messageIdentifier) {

        return disableCellBroadcastRange(messageIdentifier, messageIdentifier);

    public boolean disableCellBroadcast(int messageIdentifier, int ranType) {

        return disableCellBroadcastRange(messageIdentifier, messageIdentifier, ranType);

    }



    public boolean enableCellBroadcastRange(int startMessageId, int endMessageId) {

        if (PhoneConstants.PHONE_TYPE_GSM == mPhone.getPhoneType()) {

    public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {

        if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM) {

            return enableGsmBroadcastRange(startMessageId, endMessageId);

        } else {

        } else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA) {

            return enableCdmaBroadcastRange(startMessageId, endMessageId);

        } else {

            throw new IllegalArgumentException("Not a supportted RAN Type");

        }

    }



    public boolean disableCellBroadcastRange(int startMessageId, int endMessageId) {

        if (PhoneConstants.PHONE_TYPE_GSM == mPhone.getPhoneType()) {

    public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {

        if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM ) {

            return disableGsmBroadcastRange(startMessageId, endMessageId);

        } else {

        } else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA)  {

            return disableCdmaBroadcastRange(startMessageId, endMessageId);

        } else {

            throw new IllegalArgumentException("Not a supportted RAN Type");

        }

    }
@@ -616,13 +620,13 @@ public class IccSmsInterfaceManager { 
                Binder.getCallingUid());



        if (!mCellBroadcastRangeManager.enableRange(startMessageId, endMessageId, client)) {

            log("Failed to add cell broadcast subscription for MID range " + startMessageId

            log("Failed to add GSM cell broadcast subscription for MID range " + startMessageId

                    + " to " + endMessageId + " from client " + client);

            return false;

        }



        if (DBG)

            log("Added cell broadcast subscription for MID range " + startMessageId

            log("Added GSM cell broadcast subscription for MID range " + startMessageId

                    + " to " + endMessageId + " from client " + client);



        setCellBroadcastActivation(!mCellBroadcastRangeManager.isEmpty());
@@ -643,13 +647,13 @@ public class IccSmsInterfaceManager { 
                Binder.getCallingUid());



        if (!mCellBroadcastRangeManager.disableRange(startMessageId, endMessageId, client)) {

            log("Failed to remove cell broadcast subscription for MID range " + startMessageId

            log("Failed to remove GSM cell broadcast subscription for MID range " + startMessageId

                    + " to " + endMessageId + " from client " + client);

            return false;

        }



        if (DBG)

            log("Removed cell broadcast subscription for MID range " + startMessageId

            log("Removed GSM cell broadcast subscription for MID range " + startMessageId

                    + " to " + endMessageId + " from client " + client);



        setCellBroadcastActivation(!mCellBroadcastRangeManager.isEmpty());

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

+22 −16
Original line number Diff line number Diff line
@@ -162,26 +162,29 @@ public class UiccSmsController extends ISms.Stub { 
        }

    }



    public boolean enableCellBroadcast(int messageIdentifier) throws android.os.RemoteException {

        return enableCellBroadcastForSubscriber(getPreferredSmsSubscription(), messageIdentifier);

    public boolean enableCellBroadcast(int messageIdentifier, int ranType)

            throws android.os.RemoteException {

        return enableCellBroadcastForSubscriber(getPreferredSmsSubscription(), messageIdentifier,

                ranType);

    }



    public boolean enableCellBroadcastForSubscriber(int subId, int messageIdentifier)

    public boolean enableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType)

                throws android.os.RemoteException {

        return enableCellBroadcastRangeForSubscriber(subId, messageIdentifier, messageIdentifier);

        return enableCellBroadcastRangeForSubscriber(subId, messageIdentifier, messageIdentifier,

                ranType);

    }



    public boolean enableCellBroadcastRange(int startMessageId, int endMessageId)

    public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType)

            throws android.os.RemoteException {

        return enableCellBroadcastRangeForSubscriber(getPreferredSmsSubscription(), startMessageId,

                endMessageId);

                endMessageId, ranType);

    }



    public boolean enableCellBroadcastRangeForSubscriber(int subId, int startMessageId,

            int endMessageId) throws android.os.RemoteException {

            int endMessageId, int ranType) throws android.os.RemoteException {

        IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);

        if (iccSmsIntMgr != null ) {

            return iccSmsIntMgr.enableCellBroadcastRange(startMessageId, endMessageId);

            return iccSmsIntMgr.enableCellBroadcastRange(startMessageId, endMessageId, ranType);

        } else {

            Rlog.e(LOG_TAG,"enableCellBroadcast iccSmsIntMgr is null for" +

                          " Subscription: " + subId);
@@ -189,26 +192,29 @@ public class UiccSmsController extends ISms.Stub { 
        return false;

    }



    public boolean disableCellBroadcast(int messageIdentifier) throws android.os.RemoteException {

        return disableCellBroadcastForSubscriber(getPreferredSmsSubscription(), messageIdentifier);

    public boolean disableCellBroadcast(int messageIdentifier, int ranType)

            throws android.os.RemoteException {

        return disableCellBroadcastForSubscriber(getPreferredSmsSubscription(), messageIdentifier,

                ranType);

    }



    public boolean disableCellBroadcastForSubscriber(int subId, int messageIdentifier)

    public boolean disableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType)

                throws android.os.RemoteException {

        return disableCellBroadcastRangeForSubscriber(subId, messageIdentifier, messageIdentifier);

        return disableCellBroadcastRangeForSubscriber(subId, messageIdentifier, messageIdentifier,

                ranType);

    }



    public boolean disableCellBroadcastRange(int startMessageId, int endMessageId)

    public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType)

            throws android.os.RemoteException {

        return disableCellBroadcastRangeForSubscriber(getPreferredSmsSubscription(), startMessageId,

                endMessageId);

                endMessageId, ranType);

    }



    public boolean disableCellBroadcastRangeForSubscriber(int subId, int startMessageId,

            int endMessageId) throws android.os.RemoteException {

            int endMessageId, int ranType) throws android.os.RemoteException {

        IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);

        if (iccSmsIntMgr != null ) {

            return iccSmsIntMgr.disableCellBroadcastRange(startMessageId, endMessageId);

            return iccSmsIntMgr.disableCellBroadcastRange(startMessageId, endMessageId, ranType);

        } else {

            Rlog.e(LOG_TAG,"disableCellBroadcast iccSmsIntMgr is null for" +

                          " Subscription:"+subId);