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

Commit 033a6f58 authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

Merge "Update the test CMAS message" am: 20c56e3a am: 796cdf81 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1697489

Change-Id: I4c9651e2dbbbff670ad243b9d9c429326394458b
parents fec6da83 796cdf81

src/java/com/android/internal/telephony/cdma/CdmaInboundSmsHandler.java

+7 −7
Original line number Diff line number Diff line
@@ -445,16 +445,16 @@ public class CdmaInboundSmsHandler extends InboundSmsHandler { 
     *

     * adb shell am broadcast -a com.android.internal.telephony.cdma.TEST_TRIGGER_CELL_BROADCAST \

     * --ei service_category 4097 \

     * --es bearer_data_string 00031303900801C00D0101015C02D00002BFD1931054D208119313D3D10815D05 \

     * 493925391C81193D48814D3D555120810D3D0D3D3925393C810D3D5539516480B481393D495120810D1539514 \

     * 9053081054925693D390481553951253080D0C4D481413481354D500

     * --es bearer_data_string 0003104D200801C00D010101510278000260A34C834E4208D327CF8882BC1A53A \

     * 4CE8E8234FA4829CFAB52420873E1CF9D2674F410E7D59D52CA05A8274FA5524208716754A506620834A4DA9F \

     * 3A0A0AB3AA499881A316A8284D41369D40

     *

     * adb shell am broadcast -a com.android.internal.telephony.cdma.TEST_TRIGGER_CELL_BROADCAST \

     * --ei service_category 4097 \

     * --es bearer_data_string 00031303900801C00D0101015C02D00002BFD1931054D208119313D3D10815D05 \

     * 493925391C81193D48814D3D555120810D3D0D3D3925393C810D3D5539516480B481393D495120810D1539514 \

     * 9053081054925693D390481553951253080D0C4D481413481354D500 \

     * --ei phone_id 0 \

     * --es bearer_data_string 0003104D200801C00D010101510278000260A34C834E4208D327CF8882BC1A53A \

     * 4CE8E8234FA4829CFAB52420873E1CF9D2674F410E7D59D52CA05A8274FA5524208716754A506620834A4DA9F \

     * 3A0A0AB3AA499881A316A8284D41369D40 \

     * --ei phone_id 0

     */

    private class CdmaCbTestBroadcastReceiver extends CbTestBroadcastReceiver {

src/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java

+0 −6
Original line number Diff line number Diff line
@@ -105,12 +105,6 @@ public class GsmInboundSmsHandler extends InboundSmsHandler { 
                return;

            }



            // Return early if phone_id is explicilty included and does not match mPhone.

            // If phone_id extra is not included, continue.

            int phoneId = mPhone.getPhoneId();

            if (intent.getIntExtra("phone_id", phoneId) != phoneId) {

                return;

            }

            Message m = Message.obtain();

            AsyncResult.forMessage(m, smsPdu, null);

            mCellBroadcastServiceManager.sendGsmMessageToHandler(m);