summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorNaveen Kalla <nkalla@codeaurora.org>2010-08-11 09:53:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-11 09:53:01 -0700
commit371dbcba11070ed2fdd58a4c328b5d7b9ad65a40 (patch)
tree7211dd26716c704c755b8dc3f980e3c2a2000b0d /telephony/java
parent92798a481cbd928711339606bc1d9e81fa80f7b2 (diff)
parentc4c4c98c5ca6b4c017a5b429a6bd80a440c63559 (diff)
downloadframeworks_base-371dbcba11070ed2fdd58a4c328b5d7b9ad65a40.zip
frameworks_base-371dbcba11070ed2fdd58a4c328b5d7b9ad65a40.tar.gz
frameworks_base-371dbcba11070ed2fdd58a4c328b5d7b9ad65a40.tar.bz2
am c4c4c98c: In CW Interrogation service class is not sent.
Merge commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559' into gingerbread-plus-aosp * commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559': In CW Interrogation service class is not sent.
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GSMPhone.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
index 5f093d4..69a7a57 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -972,7 +972,9 @@ public class GSMPhone extends PhoneBase {
}
public void getCallWaiting(Message onComplete) {
- mCM.queryCallWaiting(CommandsInterface.SERVICE_CLASS_VOICE, onComplete);
+ //As per 3GPP TS 24.083, section 1.6 UE doesn't need to send service
+ //class parameter in call waiting interrogation to network
+ mCM.queryCallWaiting(CommandsInterface.SERVICE_CLASS_NONE, onComplete);
}
public void setCallWaiting(boolean enable, Message onComplete) {