commit f7fbc02e426df2f1d0afa2ed1878b8dc169880ea
author Yorke Lee <yorkelee@google.com> Wed Sep 18 01:36:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 18 01:36:15 2013 +0000
tree 191f780de0ead16e5ecf86cc68161b64a53e840c
parent 94853bc62179c70dfb1f71151225cbb4e76a0b50
parent 7984000187238151f2a5c46c7289db87df923050

Merge "Add bind call permission check to Telephony service" into klp-dev

src/com/android/phone/CallModeler.java

diff --git a/src/com/android/phone/CallModeler.java b/src/com/android/phone/CallModeler.java
index 7af2416..a1a5cab 100644
--- a/src/com/android/phone/CallModeler.java
+++ b/src/com/android/phone/CallModeler.java
@@ -592,7 +592,7 @@
         boolean canMute = false;
 
         final boolean supportHold = PhoneUtils.okToSupportHold(mCallManager);
-        final boolean canHold = PhoneUtils.okToHoldCall(mCallManager);
+        final boolean canHold = (supportHold ? PhoneUtils.okToHoldCall(mCallManager) : false);
         final boolean genericConf = isForConference &&
                 (connection.getCall().getPhone().getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA);