resolved conflicts for merge of c1edfc2c to master

 * {@hide}

 * {@hide}

 */

 */

oneway interface ITelephonyListener {

oneway interface ITelephonyListener {

    /**

     * Notify of a new or updated call.

     * Any time the state of a call is updated, it will alert any listeners. This includes changes

     * of state such as when a call is put on hold or conferenced.

     *

     * @param callId a unique identifier for a given call that can be used to track state changes

     * @param state the new state of the call.

     *              {@see com.android.services.telephony.common.Call$State}

     * @param number the phone number of the call. For some states, this may be blank. However, it

     *               will be populated for any initial state.

     */

    void onUpdate(int callId, int state, String number);

    void onUpdate(int callId, int state, String number);

}

}