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

Commit 2f1e2063 authored by Rika Brooks's avatar Rika Brooks Committed by Steve Kondik
Browse files

Telephony: SMS over IMS 

Add RIL_REQUEST_IMS_REGISTRATION_STATE, RIL_REQUEST_IMS_SEND_SMS, and
RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED.  Add FORMAT_UNKNOWN to
SmsConstants

Change-Id: Iabaf4cce9f1da94f3f263d09cdd0bc29fbea741d
parent cf1e4027

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

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

/*

** Copyright 2007, The Android Open Source Project

** Copyright 2007, The Android Open Source Project

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

**

**

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

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

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

** you may not use this file except in compliance with the License.
@@ -216,4 +217,26 @@ interface ISms { 
     * Requires system permission.

     * Requires system permission.

     */

     */

    void setPremiumSmsPermission(String packageName, int permission);

    void setPremiumSmsPermission(String packageName, int permission);



    /**

     * SMS over IMS is supported if IMS is registered and SMS is supported

     * on IMS.

     *

     * @return true if SMS over IMS is supported, false otherwise

     *

     * @see #getImsSmsFormat()

     */

    boolean isImsSmsSupported();



    /**

     * Gets SMS format supported on IMS.  SMS over IMS format is

     * either 3GPP or 3GPP2.

     *

     * @return android.telephony.SmsMessage.FORMAT_3GPP,

     *         android.telephony.SmsMessage.FORMAT_3GPP2

     *      or android.telephony.SmsMessage.FORMAT_UNKNOWN

     *

     * @see #isImsSmsSupported()

     */

    String getImsSmsFormat();

}
 
}

telephony/java/com/android/internal/telephony/RILConstants.java

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

/*

 * Copyright (C) 2006 The Android Open Source Project

 * Copyright (C) 2006 The Android Open Source Project

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

 *

 *

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

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

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

 * you may not use this file except in compliance with the License.
@@ -262,6 +263,8 @@ cat include/telephony/ril.h | \ 
    int RIL_REQUEST_VOICE_RADIO_TECH = 108;

    int RIL_REQUEST_VOICE_RADIO_TECH = 108;

    int RIL_REQUEST_GET_CELL_INFO_LIST = 109;

    int RIL_REQUEST_GET_CELL_INFO_LIST = 109;

    int RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110;

    int RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110;

    int RIL_REQUEST_IMS_REGISTRATION_STATE = 111;

    int RIL_REQUEST_IMS_SEND_SMS = 112;

    int RIL_UNSOL_RESPONSE_BASE = 1000;

    int RIL_UNSOL_RESPONSE_BASE = 1000;

    int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;

    int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;

    int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001;

    int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001;
@@ -300,5 +303,8 @@ cat include/telephony/ril.h | \ 
    int RIL_UNSOL_RIL_CONNECTED = 1034;

    int RIL_UNSOL_RIL_CONNECTED = 1034;

    int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035;

    int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035;

    int RIL_UNSOL_CELL_INFO_LIST = 1036;

    int RIL_UNSOL_CELL_INFO_LIST = 1036;

    int RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED = 1037;





    int RIL_UNSOL_STK_SEND_SMS_RESULT = 11002; /* Samsung STK */

    int RIL_UNSOL_STK_SEND_SMS_RESULT = 11002; /* Samsung STK */

}
 
}

telephony/java/com/android/internal/telephony/SmsConstants.java

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

/*

 * Copyright (C) 2012 The Android Open Source Project

 * Copyright (C) 2012 The Android Open Source Project

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

 *

 *

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

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

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

 * you may not use this file except in compliance with the License.
@@ -61,6 +62,12 @@ public class SmsConstants { 
        UNKNOWN, CLASS_0, CLASS_1, CLASS_2, CLASS_3;

        UNKNOWN, CLASS_0, CLASS_1, CLASS_2, CLASS_3;

    }

    }





    /**

     * Indicates unknown format SMS message.

     * @hide pending API council approval

     */

    public static final String FORMAT_UNKNOWN = "unknown";



    /**

    /**

     * Indicates a 3GPP format SMS message.

     * Indicates a 3GPP format SMS message.

     * @hide pending API council approval

     * @hide pending API council approval