diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-05-30 21:38:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 21:38:54 +0000 |
| commit | b69f1bddfe39c93f1e120e13a835768f68451e36 (patch) | |
| tree | 3d4df5be197f83a67348c7613b329f34c20b6dda /telephony/java/android | |
| parent | 25ceaab596ae87fe4808af11bd2c11fe05d3aa72 (diff) | |
| parent | 515e09b8373a2cffc5be633d4b196bf68e62edbd (diff) | |
| download | frameworks_base-b69f1bddfe39c93f1e120e13a835768f68451e36.zip frameworks_base-b69f1bddfe39c93f1e120e13a835768f68451e36.tar.gz frameworks_base-b69f1bddfe39c93f1e120e13a835768f68451e36.tar.bz2 | |
am 6d052adc: Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev
* commit '6d052adc910bf2d2775881528cef3e41fe2cd14b':
Update showCallScreen to use Telecomm (1/6)
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 2483419..ffa9a4e 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1988,9 +1988,10 @@ public class TelephonyManager { @PrivateApi public boolean showCallScreen() { try { - return getITelephony().showCallScreen(); + getTelecommService().showCallScreen(false); + return true; } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelephony#showCallScreen", e); + Log.e(TAG, "Error calling ITelecommService#showCallScreen", e); } return false; } @@ -1999,9 +2000,10 @@ public class TelephonyManager { @PrivateApi public boolean showCallScreenWithDialpad(boolean showDialpad) { try { - return getITelephony().showCallScreenWithDialpad(showDialpad); + getTelecommService().showCallScreen(showDialpad); + return true; } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelephony#showCallScreenWithDialpad", e); + Log.e(TAG, "Error calling ITelecommService#showCallScreen(" + showDialpad + ")", e); } return false; } |