diff --git a/device.mk b/device.mk
index 1413940..77d801d 100644
--- a/device.mk
+++ b/device.mk
@@ -235,7 +235,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
     $(LOCAL_PATH)/gps/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf \
-    $(LOCAL_PATH)/gps/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
+    $(LOCAL_PATH)/gps/gps.conf:$(TARGET_COPY_OUT_ODM)/etc/gps.conf \
     $(LOCAL_PATH)/gps/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
     $(LOCAL_PATH)/gps/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
     $(LOCAL_PATH)/gps/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
diff --git a/gps/gps.conf b/gps/gps.conf
index c5e9dd1..65a15b0 100644
--- a/gps/gps.conf
+++ b/gps/gps.conf
@@ -12,13 +12,18 @@ XTRA_CA_PATH=/usr/lib/ssl-1.1/certs
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
 # If DEBUG_LEVEL is commented, Android's logging levels will be used
+#ifndef OPLUS_BUG_DEBUG
+#LinHuaqiu@CONNECTIVITY.GPS.LOCATION.LOG.1065783, 2017/11/04, Add for gps log control
+#DEBUG_LEVEL = 3
+#else /* OPLUS_BUG_DEBUG */
 DEBUG_LEVEL = 2
+#endif /* OPLUS_BUG_DEBUG */
 
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
 
-# supl version 2.0
-SUPL_VER=0x20000
+# supl version 1.0
+SUPL_VER=0x10000
 
 # Emergency SUPL, 1=enable, 0=disable
 #SUPL_ES=1
@@ -33,7 +38,7 @@ SUPL_VER=0x20000
 #config.xml.
 #MSA=0X2
 #MSB=0X1
-SUPL_MODE=3
+#SUPL_MODE=
 
 # GPS Capabilities bit mask
 # SCHEDULING = 0x01
@@ -52,8 +57,8 @@ CAPABILITIES=0x17
 ################################
 
 # FOR SUPL SUPPORT, set the following
-SUPL_HOST=supl.google.com
-SUPL_PORT=7275
+# SUPL_HOST=supl.host.com or IP
+# SUPL_PORT=1234
 
 # FOR MO SUPL SUPPORT, set the following
 # MO_SUPL_HOST=supl.host.com or IP
@@ -80,7 +85,7 @@ SUPL_PORT=7275
 # 0x2: LPP Control Plane
 # 0x4: LPP User Plane for NR5G
 # 0x8: LPP Control Plane for NR5G
-LPP_PROFILE = 3
+LPP_PROFILE = 2
 
 ####################################
 #Datum Type
@@ -155,7 +160,7 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0
 # 0x2: WLAN AP Measurements for LPPe CP
 # 0x4: SRN AP measurement for CP
 # 0x8: Sensor Barometer Measurement LPPe CP
-LPPE_CP_TECHNOLOGY = 0xb
+#LPPE_CP_TECHNOLOGY = 0
 
 ##################################################
 # Select technology for LPPe User Plane
@@ -308,7 +313,12 @@ MODEM_TYPE = 1
 #####################################
 # This is a string that is sent to the framework
 # in nfwNotifyCb callback
-PROXY_APP_PACKAGE_NAME = com.oneplus.carrierlocation
+#ifndef OPLUS_BUG_STABILITY
+#LiZhilong@CONNECTIVITY.GPS.LOCATION.OPCUSTOMIZED.2786815, 2020/01/10, Modify for nfw proxy app
+#PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation
+#else /* OPLUS_BUG_STABILITY */
+PROXY_APP_PACKAGE_NAME = com.oplus.locationproxy
+#endif /* OPLUS_BUG_STABILITY */
 
 #####################################
 # CP_MTLR_ES