diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-13 11:48:48 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-02-13 11:48:48 +0000 |
| commit | 005151484546fb0bf7f83c5a6ee065715230bf26 (patch) | |
| tree | 9354232e45e7c8d7ed1f2cc6879026eae9c301b4 /telephony/java/com | |
| parent | 5da502a5b2a6eed6cf667c5d609818442a838c8a (diff) | |
| parent | 396b9e792f523ac29504a1dc68734b9f53dc5f41 (diff) | |
| download | frameworks_base-005151484546fb0bf7f83c5a6ee065715230bf26.zip frameworks_base-005151484546fb0bf7f83c5a6ee065715230bf26.tar.gz frameworks_base-005151484546fb0bf7f83c5a6ee065715230bf26.tar.bz2 | |
resolved conflicts for merge of 396b9e79 to master
Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
Diffstat (limited to 'telephony/java/com')
3 files changed, 11 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl b/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl index 3a04ceb..f228d4e 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl @@ -20,6 +20,8 @@ import android.os.Bundle; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.CellInfo; +import android.telephony.PreciseCallState; +import android.telephony.PreciseDataConnectionState; oneway interface IPhoneStateListener { void onServiceStateChanged(in ServiceState serviceState); @@ -35,5 +37,7 @@ oneway interface IPhoneStateListener { void onSignalStrengthsChanged(in SignalStrength signalStrength); void onOtaspChanged(in int otaspMode); void onCellInfoChanged(in List<CellInfo> cellInfo); + void onPreciseCallStateChanged(in PreciseCallState callState); + void onPreciseDataConnectionStateChanged(in PreciseDataConnectionState dataConnectionState); } diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index 59c8472..546ce17 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -41,4 +41,9 @@ interface ITelephonyRegistry { void notifyCellLocation(in Bundle cellLocation); void notifyOtaspChanged(in int otaspMode); void notifyCellInfo(in List<CellInfo> cellInfo); + void notifyPreciseCallState(int ringingCallState, int foregroundCallState, + int backgroundCallState); + void notifyDisconnectCause(int disconnectCause, int preciseDisconnectCause); + void notifyPreciseDataConnectionFailed(String reason, String apnType, String apn, + String failCause); } diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index fc6c997..8c42d25 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -73,6 +73,8 @@ public class PhoneConstants { public static final String PHONE_NAME_KEY = "phoneName"; public static final String FAILURE_REASON_KEY = "reason"; public static final String STATE_CHANGE_REASON_KEY = "reason"; + public static final String DATA_NETWORK_TYPE_KEY = "networkType"; + public static final String DATA_FAILURE_CAUSE_KEY = "failCause"; public static final String DATA_APN_TYPE_KEY = "apnType"; public static final String DATA_APN_KEY = "apn"; public static final String DATA_LINK_PROPERTIES_KEY = "linkProperties"; |