Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cefc16df: Merge "TelephonyManager should use TelecomManager\'s getCallState()." into mnc-dev

Browse Source 
* commit 'cefc16df98a985b8a7c40bca5d5ff3fde6b42dbf':
  TelephonyManager should use TelecomManager's getCallState().
This commit is contained in:
Santos Cordon
2015-06-11 15:38:41 +00:00
committed by Android Git Automerger
parent 2d5c9c368e cefc16df98
commit 28c65e6d64
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -193,7 +193,7 @@ public class TelephonyManager {
//
/**
* Broadcast intent action indicating that the call state (cellular)
* Broadcast intent action indicating that the call state
* on the device has changed.
*
* <p>
@@ -2437,10 +2437,23 @@ public class TelephonyManager {
public static final int CALL_STATE_OFFHOOK = 2;
/**
* Returns a constant indicating the call state (cellular) on the device.
* Returns one of the following constants that represents the current state of all
* phone calls.
*
* {@link TelephonyManager#CALL_STATE_RINGING}
* {@link TelephonyManager#CALL_STATE_OFFHOOK}
* {@link TelephonyManager#CALL_STATE_IDLE}
*/
public int getCallState() {
return getCallState(getDefaultSubscription());
try {
ITelecomService telecom = getTelecomService();
if (telecom != null) {
return telecom.getCallState();
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelecomService#getCallState", e);
}
return CALL_STATE_IDLE;
}
/**