diff options
author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-08-02 13:56:34 +0400 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-08-02 13:56:34 +0400 |
commit | 5f2e018e35d04ae6199308077c5bfd2e9eb2f417 (patch) | |
tree | a470a6d12fffef1950501c1578c6bb9fa41fb36e | |
parent | 91c4a53dd1214dd54c9f58877ab849613f416152 (diff) | |
parent | 730e2fef4e7188e0662991050ab07316252df773 (diff) | |
download | frameworks_base-5f2e018e35d04ae6199308077c5bfd2e9eb2f417.zip frameworks_base-5f2e018e35d04ae6199308077c5bfd2e9eb2f417.tar.gz frameworks_base-5f2e018e35d04ae6199308077c5bfd2e9eb2f417.tar.bz2 |
Merge "Smdk4210RIL: swap voice privacy and video" into ics
-rw-r--r-- | telephony/java/com/android/internal/telephony/Smdk4210RIL.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/Smdk4210RIL.java b/telephony/java/com/android/internal/telephony/Smdk4210RIL.java index fa60598..75b64cc 100644 --- a/telephony/java/com/android/internal/telephony/Smdk4210RIL.java +++ b/telephony/java/com/android/internal/telephony/Smdk4210RIL.java @@ -631,6 +631,7 @@ public class Smdk4210RIL extends RIL implements CommandsInterface { responseCallList(Parcel p) { int num; int voiceSettings; + int videoSettings; ArrayList<DriverCall> response; DriverCall dc; int dataAvail = p.dataAvail(); @@ -666,11 +667,10 @@ public class Smdk4210RIL extends RIL implements CommandsInterface { voiceSettings = p.readInt(); dc.isVoice = (0 == voiceSettings) ? false : true; Log.d(LOG_TAG, "isVoice = " + dc.isVoice); + // For samsungs videocall feature + videoSettings = p.readInt(); + Log.d(LOG_TAG, "isVideo = " + videoSettings); dc.isVoicePrivacy = (0 != p.readInt()); - //Some Samsung magic data for Videocalls - voiceSettings = p.readInt(); - //printing it to cosole for later investigation - Log.d(LOG_TAG, "Samsung magic = " + voiceSettings); dc.number = p.readString(); Log.d(LOG_TAG, "number = " + dc.number); int np = p.readInt(); |