am db0dca82: resolved conflicts for merge of c1edfc2c to master

* commit 'db0dca826d992af1adfa53e10c31f08d3197bb0b':
  resolved conflicts for merge of c1edfc2c to master
This commit is contained in:
Gabriel Peal
2014-03-25 13:46:13 -07:00
committed by Android Git Automerger

View File

@@ -23,16 +23,5 @@ package com.android.internal.telephony;
* {@hide}
*/
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);
}