n5100 : cleanup

Change-Id: Ic89350225ffec0f96cbe38872aae8b0cc635b6a6

5 files changed, 108 insertions, 21 deletions

diff --git a/include/hardware/gps.xml b/include/hardware/gps.xml
new file mode 100644
index 0000000..38f16ad
--- /dev/null
+++ b/include/hardware/gps.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/glconfig.xsd" >
+  <!--HAL Confguration  -->
+  <hal
+       acPortName="/dev/ttySAC1"
+       lBaudRate="921600"
+       gpioNStdbyPath="/sys/class/sec/gps/GPS_PWR_EN/value"
+       gpioDelayMs="250"
+       acNvStoDir="/data/system/gps/"
+       FactoryTestFilePath="/data/"
+
+       Log="JAVA"
+       acLogDirectory="/storage/sdcard0/gps/broadcom/storage"
+
+       TISEnabled="true"
+       LPmode="false"
+       cp-cold-start="false"
+       cp-guard-time-sec="1"
+
+       arp-supl-enable="true"
+       arp-supl-cap-msb="true"
+       arp-supl-cap-msa="true"
+       arp-supl-cap-ecid="false"
+       arp-supl-use-apn="false"
+       acSuplServer="supl.google.com"
+       SuplPort="7276"
+       tlsCertPath="/system/bin/gps.cer"
+       tlsEnable="false"
+       ReAidingIntervalSec="1200"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       SuplVersion="1"
+
+       LbsEnable="true"
+       LbsLocal="false"
+       LbsServer="BCMLS2.glpals.com"
+       LbsPort="7275"
+       LbsSyncLto="false"
+       SyncLto="true"
+       ltoFileName="lto2.dat"
+       acLtoDir="/data/system/gps/"
+       LbsSyncLtoThresholdDays="1"
+       LbsTAC="10101106"
+       ctrlPipe="/data/gps/glgpsctrl"
+       LbsWlanEnable="false"
+
+       IgnoreJniTime="true"
+       AssertEnabled="false"
+
+       SensorsEnable="false"
+       SensorsPowerSave="false"
+       SensorsLog="false"
+
+   />
+
+  <gll
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_GLLIO | LOG_RAWDATA | LOG_DEVKF | LOG_GLLAPI | LOG_NMEA"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_26MHZ_300PPB"
+       RfType="GL_RF_4752_BRCM_EXT_LNA"
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+  >
+  </gll>
+
+  <gll_features
+       EnableLowPowerEls="false"
+       EnableLowPowerPmm="true"
+  />
+
+</glgps>
diff --git a/n5100.mk b/n5100.mk
index 1f4ba90..aebbf48 100755
--- a/n5100.mk
+++ b/n5100.mk
@@ -25,12 +25,15 @@ PRODUCT_COPY_FILES += \
 # RIL
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.telephony.ril_class=SamsungExynos4RIL \
-    mobiledata.interfaces=pdp0,wlan0,gprs,ppp0 \
-    ro.ril.hsxpa=1 \
-    ro.ril.gprsclass=10
+    mobiledata.interfaces=pdp0,wlan0,gprs,ppp0
+
+PRODUCT_PACKAGES += \
+    libsecril-client \
+    libsecril-client-sap
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/include/hardware/gps.xml:system/etc/gps.xml \
     frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \
@@ -38,4 +41,4 @@ PRODUCT_COPY_FILES += \
 
 # Include common makefile
 $(call inherit-product, device/samsung/kona-common/kona-common.mk)
-$(call inherit-product, vendor/samsung/n5100/n5100-vendor.mk)
\ No newline at end of file
+$(call inherit-product, vendor/samsung/n5100/n5100-vendor.mk)
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b90b176..5362c38 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,8 +1,11 @@
-system/lib/libsec-ril.so
-system/lib/libreference-ril.so
+system/bin/at_distributor
+system/bin/geomagneticd
+system/bin/gpsd
+system/bin/orientationd
+system/bin/smdexe
 system/lib/libomission_avoidance.so
-system/lib/libaudio-ril.so
-system/lib/libril.so
-system/lib/librilutils.so
-system/lib/libsecril-client.so
-
+system/lib/libsec-ril.so
+system/lib/libwrappergps.so
+system/lib/libfactoryutil.so
+system/lib/hw/gps.default.so
+sbin/cbd
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index cf53b26..24e577a 100755
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -217,6 +217,16 @@ on property:sys.boot_completed=1
     chmod 0660 /sys/devices/system/cpu/cpufreq/pegasusq/min_cpu_lock
     chmod 0660 /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_lock
 
+on property:sys.boot_completed=1
+    stop at_distributor
+    stop cpboot-daemon
+    stop SMD-daemon
+    stop rild
+    start at_distributor
+    start cpboot-daemon
+    start SMD-daemon
+    start rild
+
 ############################
 ############################
 
@@ -264,9 +274,3 @@ service SMD-daemon /system/bin/smdexe
     user root
     group system radio inet log cache misc audio net_raw sdcard_rw gps
     seclabel u:r:SMD-daemon:s0
-
-service DR-daemon /system/bin/ddexe
-    class main
-    user root
-    group system radio inet log cache misc audio net_raw sdcard_rw gps
-    seclabel u:r:DR-daemon:s0
diff --git a/system.prop b/system.prop
index 0d01e55..85ac8f8 100755
--- a/system.prop
+++ b/system.prop
@@ -1,10 +1,15 @@
 #
-# system.prop for smdk4x12
+# system.prop for n5100
 #
-dalvik.vm.dexopt-data-only=1
+
 rild.libpath=/system/lib/libsec-ril.so
 rild.libargs=-d /dev/ttyS0
+ro.lcd_min_brightness=20
 ro.sf.hwrotation=270
 ro.sf.lcd_density=213
-ro.lcd_min_brightness=20
-ro.hdcp2.rx=tz
\ No newline at end of file
+ro.hdcp2.rx=tz
+ro.ril.hsxpa=1
+ro.ril.gprsclass=10
+persist.radio.add_power_save=1
+persist.radio.apm_sim_not_pwdn=1
+persist.radio.no_wait_for_card=1