smdk4412-qcom: fix gsm drivercall and add gps properties

Change-Id: I6e59a7b56ac6e4a957e9e2b50362fb8b47a3d117

2 files changed, 6 insertions, 7 deletions

diff --git a/common.mk b/common.mk
index b039d84..b2afbff 100644
--- a/common.mk
+++ b/common.mk
@@ -23,6 +23,12 @@ PRODUCT_PACKAGES += \
     libloc_core \
     libloc_eng
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.gps.agps_provider=1 \
+    ro.qc.sdk.izat.premium_enabled=0 \
+    ro.qc.sdk.izat.service_mask=0x0 \
+    persist.gps.qc_nlp_in_use=0
+
 ifeq ($(TARGET_VOICE_TECH), cdma)
     GPS_CONF := $(COMMON_PATH)/gps/etc/gps-cdma.conf
 else
diff --git a/ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java b/ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java
index b51bef5..a750ea4 100644
--- a/ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java
+++ b/ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java
@@ -301,17 +301,10 @@ public class smdk4x12QComRIL extends RIL implements CommandsInterface {
             dc.isMT = (0 != p.readInt());
             dc.als = p.readInt();
             voiceSettings = p.readInt();
-            if (isGSM)
-                p.readInt();
             dc.isVoice = (0 == voiceSettings) ? false : true;
             if(driverCallU || (driverCall && !isGSM) || mRilVersion < 7 ? false : true)
                  p.readInt();
             dc.isVoicePrivacy = (0 != p.readInt());
-            if (isGSM) {
-                p.readInt();
-                p.readInt();
-                p.readString();
-            }
             dc.number = p.readString();
             int np = p.readInt();
             dc.numberPresentation = DriverCall.presentationFromCLIP(np);