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

Commit 38c4118a authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "SMS over IMS bug fixes" into klp-dev

parents c0384e80 ace9a749

src/java/android/telephony/SmsManager.java

+0 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

src/java/android/telephony/SmsMessage.java

+0 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

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

+0 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 The Android Open Source Project

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

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

+6 −5
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 The Android Open Source Project

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -111,13 +110,15 @@ public interface CommandsInterface { 
    RadioState getRadioState();



    /**

     * response.obj.result is an int[2]

     * response.obj.result is an int[3]

     *

     * response.obj.result[0] is registration state

     * response.obj.result[0] is IMS registration state

     *                        0 - Not registered

     *                        1 - Registered

     * response.obj.result[1] is of type const RIL_IMS_SMS_Format,

     *                        corresponds to sms format used for SMS over IMS.

     * response.obj.result[1] is bitmap of supported services

     *                        & 0x1 - SMS supported

     * response.obj.result[2 ] is of type RILConstants.GSM_PHONE or

     *                                    RILConstants.CDMA_PHONE

     */

    void getImsRegistrationState(Message result);

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

+1 −7
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -90,8 +89,7 @@ public class IccSmsInterfaceManager extends ISms.Stub { 
                    ar = (AsyncResult)msg.obj;

                    synchronized (mLock) {

                        if (ar.exception == null) {

                            mSms  = (List<SmsRawData>)

                                    buildValidRawData((ArrayList<byte[]>) ar.result);

                            mSms = buildValidRawData((ArrayList<byte[]>) ar.result);

                            //Mark SMS as read after importing it from card.

                            markMessagesAsRead((ArrayList<byte[]>) ar.result);

                        } else {
@@ -160,10 +158,6 @@ public class IccSmsInterfaceManager extends ISms.Stub { 
        }

    }



    public void dispose() {

        mDispatcher.dispose();

    }



    protected void updatePhoneObject(PhoneBase phone) {

        mPhone = phone;

        mDispatcher.updatePhoneObject(phone);