Merge commit 'a92bbd4cd83aeafbdc28aae606df8c6cb94c1f5e' into HEADidea133

13 files changed, 142 insertions, 84 deletions

diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index 2e80765..4ce1da3 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -235,16 +235,17 @@ gNumChanCombinedConc=255
 
 # TDLS configuration
 gEnableTDLSSupport=1
-gEnableTDLSImplicitTrigger=0
-gTDLSTxStatsPeriod=5000
-gTDLSTxPacketThreshold=100
+gEnableTDLSImplicitTrigger=1
+gTDLSExternalControl=1
+gTDLSTxStatsPeriod=500
+gTDLSTxPacketThreshold=10
 gTDLSDiscoveryPeriod=20000
 gTDLSMaxDiscoveryAttempt=5
-gTDLSIdleTimeout=5000
+gTDLSIdleTimeout=40000
 gTDLSRssiHysteresis=100
-gTDLSRSSITriggerThreshold=-75
+gTDLSRSSITriggerThreshold=-60
 gTDLSIdlePacketThreshold=5
-gTDLSRSSITeardownThreshold=-75
+gTDLSRSSITeardownThreshold=-70
 
 END
 # Note: Configuration parser would not read anything past the END marker
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index fe328ba..2ff54ac 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -29,4 +29,5 @@
 
 #define BTA_DISABLE_DELAY 1000 /* in milliseconds */
 #define BTA_HOST_INTERLEAVE_SEARCH TRUE
+#define BTA_SKIP_BLE_READ_REMOTE_FEAT TRUE
 #endif
diff --git a/camera/QCamera2/HAL/QCameraPostProc.h b/camera/QCamera2/HAL/QCameraPostProc.h
index 230f6df..180c3d7 100644
--- a/camera/QCamera2/HAL/QCameraPostProc.h
+++ b/camera/QCamera2/HAL/QCameraPostProc.h
@@ -75,7 +75,7 @@ typedef struct {
     qcamera_release_data_t   release_data; // any data needs to be release after notify
 } qcamera_data_argm_t;
 
-#define MAX_EXIF_TABLE_ENTRIES 14
+#define MAX_EXIF_TABLE_ENTRIES 17
 class QCameraExif
 {
 public:
diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp
index 14a13c1..733237d 100755
--- a/camera/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp
@@ -1631,6 +1631,10 @@ QCamera3Exif *QCamera3PicChannel::getExifData()
                        EXIF_ASCII,
                        count,
                        (void *)dateTime);
+        exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_DIGITIZED,
+                       EXIF_ASCII,
+                       count,
+                       (void *)dateTime);
     } else {
         ALOGE("%s: getExifDateTime failed", __func__);
     }
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 1f4ffe8..cf88158 100755
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -2179,7 +2179,7 @@ void QCamera3HardwareInterface::makeOverridesList(cam_scene_mode_overrides_t* ov
     for (int i = 0; i < size; i++) {
         supt = 0;
         index = supported_indexes[i];
-        overridesList[j] = (uint8_t)overridesTable[index].ae_mode;
+        overridesList[j] = gCamCapability[camera_id]->flash_available ? ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH:ANDROID_CONTROL_AE_MODE_ON;
         overridesList[j+1] = (uint8_t)lookupFwkName(WHITE_BALANCE_MODES_MAP,
                                  sizeof(WHITE_BALANCE_MODES_MAP)/sizeof(WHITE_BALANCE_MODES_MAP[0]),
                                                     overridesTable[index].awb_mode);
diff --git a/camera/QCamera2/HAL3/QCamera3PostProc.h b/camera/QCamera2/HAL3/QCamera3PostProc.h
index e2f02b5..efb383f 100755
--- a/camera/QCamera2/HAL3/QCamera3PostProc.h
+++ b/camera/QCamera2/HAL3/QCamera3PostProc.h
@@ -71,7 +71,7 @@ typedef struct {
     mm_jpeg_output_t out_data;         // ptr to jpeg output buf
 } qcamera_jpeg_evt_payload_t;
 
-#define MAX_EXIF_TABLE_ENTRIES 14
+#define MAX_EXIF_TABLE_ENTRIES 17
 class QCamera3Exif
 {
 public:
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 2a53f07..472934d 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -91,7 +91,6 @@
 /system/lib/libdss.so
 /system/lib/libdsucsd.so
 /system/lib/libdsutils.so
-/system/lib/libDxHdcp.so
 /system/lib/libgps.utils.so
 /system/lib/libgsl.so
 /system/lib/libI420colorconvert.so
diff --git a/self-extractors/asus/staging/device-partial.mk b/self-extractors/asus/staging/device-partial.mk
index 30e131f..c8dee90 100644
--- a/self-extractors/asus/staging/device-partial.mk
+++ b/self-extractors/asus/staging/device-partial.mk
@@ -14,6 +14,6 @@
 
 # Asus blob(s) necessary for Flo hardware
 PRODUCT_COPY_FILES := \
-    vendor/asus/flo/proprietary/libAKM.so:system/lib/libAKM.so:asus \
     vendor/asus/flo/proprietary/libacdbdata.so:system/lib/libacdbdata.so:asus \
+    vendor/asus/flo/proprietary/libAKM.so:system/lib/libAKM.so:asus \
 
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 6b946ce..0843715 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -1,7 +1,7 @@
   asus)
     TO_EXTRACT="\
-            system/lib/libAKM.so \
             system/lib/libacdbdata.so \
+            system/lib/libAKM.so \
             "
     ;;
   broadcom)
@@ -22,7 +22,6 @@
             system/bin/hci_qcomm_init \
             system/bin/irsc_util \
             system/bin/ks \
-            system/bin/mm-pp-daemon \
             system/bin/mm-qcamera-app \
             system/bin/mm-qcamera-daemon \
             system/bin/mm-qjpeg-enc-test \
@@ -41,33 +40,35 @@
             system/bin/usbhub \
             system/bin/usbhub_init \
             system/etc/DxHDCP.cfg \
+            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidc.b00 \
             system/etc/firmware/vidc.b01 \
             system/etc/firmware/vidc.b02 \
             system/etc/firmware/vidc.b03 \
-            system/etc/firmware/vidc.mdt \
-            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidcfw.elf \
+            system/etc/firmware/vidc.mdt \
+            system/etc/gps.conf \
             system/lib/egl/eglsubAndroid.so \
-            system/lib/egl/libEGL_adreno200.so \
-            system/lib/egl/libGLESv1_CM_adreno200.so \
-            system/lib/egl/libGLESv2_adreno200.so \
-            system/lib/egl/libq3dtools_adreno200.so \
-            system/lib/hw/camera.flo.so \
+            system/lib/egl/libEGL_adreno.so \
+            system/lib/egl/libGLESv1_CM_adreno.so \
+            system/lib/egl/libGLESv2_adreno.so \
+            system/lib/egl/libplayback_adreno.so \
+            system/lib/egl/libq3dtools_adreno.so \
+            system/lib/hw/flp.msm8960.so \
             system/lib/hw/gps.msm8960.so \
             system/lib/hw/sensors.msm8960.so \
-            system/lib/libC2D2.so \
-            system/lib/libCommandSvc.so \
-            system/lib/libDxHdcp.so \
-            system/lib/libI420colorconvert.so \
-            system/lib/libQSEEComAPI.so \
             system/lib/libacdbloader.so \
+            system/lib/libadreno_utils.so \
             system/lib/libaudcal.so \
             system/lib/libaudioalsa.so \
-            system/lib/libc2d2_a3xx.so \
+            system/lib/libC2D2.so \
+            system/lib/libc2d30-a3xx.so \
+            system/lib/libc2d30.so \
+            system/lib/libCB.so \
             system/lib/libchromatix_ov5693_common.so \
             system/lib/libchromatix_ov5693_default_video.so \
             system/lib/libchromatix_ov5693_preview.so \
+            system/lib/libCommandSvc.so \
             system/lib/libconfigdb.so \
             system/lib/libcsd-client.so \
             system/lib/libdiag.so \
@@ -79,29 +80,24 @@
             system/lib/libdss.so \
             system/lib/libdsucsd.so \
             system/lib/libdsutils.so \
-            system/lib/libgeofence.so \
             system/lib/libgps.utils.so \
             system/lib/libgsl.so \
+            system/lib/libI420colorconvert.so \
             system/lib/libidl.so \
             system/lib/libllvm-a3xx.so \
-            system/lib/libloc_adapter.so \
-            system/lib/libloc_api_v02.so \
+            system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
-            system/lib/libmm-abl-oem.so \
             system/lib/libmm-abl.so \
-            system/lib/libmm-color-convertor.so \
             system/lib/libmmcamera2_stats_algorithm.so \
             system/lib/libmmcamera_image_stab.so \
-            system/lib/libmmcamera_interface.so \
             system/lib/libmmcamera_mi1040.so \
             system/lib/libmmcamera_ov5693.so \
-            system/lib/libmmjpeg_interface.so \
+            system/lib/libmm-color-convertor.so \
             system/lib/libnetmgr.so \
             system/lib/liboemcrypto.so \
             system/lib/libqcci_legacy.so \
             system/lib/libqdi.so \
             system/lib/libqdp.so \
-            system/lib/libqmi.so \
             system/lib/libqmi_cci.so \
             system/lib/libqmi_client_qmux.so \
             system/lib/libqmi_common_so.so \
@@ -109,7 +105,11 @@
             system/lib/libqmi_csvt_srvc.so \
             system/lib/libqmi_encdec.so \
             system/lib/libqmiservices.so \
-            system/lib/libqomx_core.so \
+            system/lib/libqmi.so \
+            system/lib/libQSEEComAPI.so \
+            system/lib/librs_adreno_sha1.so \
+            system/lib/librs_adreno.so \
+            system/lib/libRSDriver_adreno.so \
             system/lib/libsc-a3xx.so \
             system/lib/libsensor1.so \
             system/lib/libsensor_reg.so \
@@ -143,6 +143,11 @@
             system/vendor/firmware/gss.b10 \
             system/vendor/firmware/gss.b11 \
             system/vendor/firmware/gss.mdt \
+            system/vendor/firmware/keymaster/keymaster.b00 \
+            system/vendor/firmware/keymaster/keymaster.b01 \
+            system/vendor/firmware/keymaster/keymaster.b02 \
+            system/vendor/firmware/keymaster/keymaster.b03 \
+            system/vendor/firmware/keymaster/keymaster.mdt \
             system/vendor/firmware/q6.b00 \
             system/vendor/firmware/q6.b01 \
             system/vendor/firmware/q6.b03 \
@@ -163,8 +168,12 @@
             system/vendor/firmware/wcnss.mdt \
             system/vendor/lib/libdrmdecrypt.so \
             system/vendor/lib/libgemini.so \
+            system/vendor/lib/libgeofence.so \
             system/vendor/lib/libimage-jpeg-enc-omx-comp.so \
             system/vendor/lib/libimage-omx-common.so \
+            system/vendor/lib/libizat_core.so \
+            system/vendor/lib/libloc_api_v02.so \
+            system/vendor/lib/libloc_ds_api.so \
             system/vendor/lib/libmmcamera2_c2d_module.so \
             system/vendor/lib/libmmcamera2_cpp_module.so \
             system/vendor/lib/libmmcamera2_iface_modules.so \
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 66173fc..05cbf15 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -30,8 +30,8 @@
 # 748593 = JSS15J
 # 750418 = JSS15K
 # end jb-mr2-dev
-BRANCH=jb-mr2-dev
-if test $BRANCH = jb-mr2-dev
+BRANCH=klp-dev
+if test $BRANCH = klp-dev
 then
   ZIP=razor-ota-748593
   BUILD=jss15j
@@ -50,8 +50,8 @@ do
   case $COMPANY in
   asus)
     TO_EXTRACT="\
-            system/lib/libAKM.so \
             system/lib/libacdbdata.so \
+            system/lib/libAKM.so \
             "
     ;;
   broadcom)
@@ -72,7 +72,6 @@ do
             system/bin/hci_qcomm_init \
             system/bin/irsc_util \
             system/bin/ks \
-            system/bin/mm-pp-daemon \
             system/bin/mm-qcamera-app \
             system/bin/mm-qcamera-daemon \
             system/bin/mm-qjpeg-enc-test \
@@ -91,33 +90,35 @@ do
             system/bin/usbhub \
             system/bin/usbhub_init \
             system/etc/DxHDCP.cfg \
+            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidc.b00 \
             system/etc/firmware/vidc.b01 \
             system/etc/firmware/vidc.b02 \
             system/etc/firmware/vidc.b03 \
-            system/etc/firmware/vidc.mdt \
-            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidcfw.elf \
+            system/etc/firmware/vidc.mdt \
+            system/etc/gps.conf \
             system/lib/egl/eglsubAndroid.so \
-            system/lib/egl/libEGL_adreno200.so \
-            system/lib/egl/libGLESv1_CM_adreno200.so \
-            system/lib/egl/libGLESv2_adreno200.so \
-            system/lib/egl/libq3dtools_adreno200.so \
-            system/lib/hw/camera.flo.so \
+            system/lib/egl/libEGL_adreno.so \
+            system/lib/egl/libGLESv1_CM_adreno.so \
+            system/lib/egl/libGLESv2_adreno.so \
+            system/lib/egl/libplayback_adreno.so \
+            system/lib/egl/libq3dtools_adreno.so \
+            system/lib/hw/flp.msm8960.so \
             system/lib/hw/gps.msm8960.so \
             system/lib/hw/sensors.msm8960.so \
-            system/lib/libC2D2.so \
-            system/lib/libCommandSvc.so \
-            system/lib/libDxHdcp.so \
-            system/lib/libI420colorconvert.so \
-            system/lib/libQSEEComAPI.so \
             system/lib/libacdbloader.so \
+            system/lib/libadreno_utils.so \
             system/lib/libaudcal.so \
             system/lib/libaudioalsa.so \
-            system/lib/libc2d2_a3xx.so \
+            system/lib/libC2D2.so \
+            system/lib/libc2d30-a3xx.so \
+            system/lib/libc2d30.so \
+            system/lib/libCB.so \
             system/lib/libchromatix_ov5693_common.so \
             system/lib/libchromatix_ov5693_default_video.so \
             system/lib/libchromatix_ov5693_preview.so \
+            system/lib/libCommandSvc.so \
             system/lib/libconfigdb.so \
             system/lib/libcsd-client.so \
             system/lib/libdiag.so \
@@ -129,29 +130,24 @@ do
             system/lib/libdss.so \
             system/lib/libdsucsd.so \
             system/lib/libdsutils.so \
-            system/lib/libgeofence.so \
             system/lib/libgps.utils.so \
             system/lib/libgsl.so \
+            system/lib/libI420colorconvert.so \
             system/lib/libidl.so \
             system/lib/libllvm-a3xx.so \
-            system/lib/libloc_adapter.so \
-            system/lib/libloc_api_v02.so \
+            system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
-            system/lib/libmm-abl-oem.so \
             system/lib/libmm-abl.so \
-            system/lib/libmm-color-convertor.so \
             system/lib/libmmcamera2_stats_algorithm.so \
             system/lib/libmmcamera_image_stab.so \
-            system/lib/libmmcamera_interface.so \
             system/lib/libmmcamera_mi1040.so \
             system/lib/libmmcamera_ov5693.so \
-            system/lib/libmmjpeg_interface.so \
+            system/lib/libmm-color-convertor.so \
             system/lib/libnetmgr.so \
             system/lib/liboemcrypto.so \
             system/lib/libqcci_legacy.so \
             system/lib/libqdi.so \
             system/lib/libqdp.so \
-            system/lib/libqmi.so \
             system/lib/libqmi_cci.so \
             system/lib/libqmi_client_qmux.so \
             system/lib/libqmi_common_so.so \
@@ -159,7 +155,11 @@ do
             system/lib/libqmi_csvt_srvc.so \
             system/lib/libqmi_encdec.so \
             system/lib/libqmiservices.so \
-            system/lib/libqomx_core.so \
+            system/lib/libqmi.so \
+            system/lib/libQSEEComAPI.so \
+            system/lib/librs_adreno_sha1.so \
+            system/lib/librs_adreno.so \
+            system/lib/libRSDriver_adreno.so \
             system/lib/libsc-a3xx.so \
             system/lib/libsensor1.so \
             system/lib/libsensor_reg.so \
@@ -193,6 +193,11 @@ do
             system/vendor/firmware/gss.b10 \
             system/vendor/firmware/gss.b11 \
             system/vendor/firmware/gss.mdt \
+            system/vendor/firmware/keymaster/keymaster.b00 \
+            system/vendor/firmware/keymaster/keymaster.b01 \
+            system/vendor/firmware/keymaster/keymaster.b02 \
+            system/vendor/firmware/keymaster/keymaster.b03 \
+            system/vendor/firmware/keymaster/keymaster.mdt \
             system/vendor/firmware/q6.b00 \
             system/vendor/firmware/q6.b01 \
             system/vendor/firmware/q6.b03 \
@@ -213,8 +218,12 @@ do
             system/vendor/firmware/wcnss.mdt \
             system/vendor/lib/libdrmdecrypt.so \
             system/vendor/lib/libgemini.so \
+            system/vendor/lib/libgeofence.so \
             system/vendor/lib/libimage-jpeg-enc-omx-comp.so \
             system/vendor/lib/libimage-omx-common.so \
+            system/vendor/lib/libizat_core.so \
+            system/vendor/lib/libloc_api_v02.so \
+            system/vendor/lib/libloc_ds_api.so \
             system/vendor/lib/libmmcamera2_c2d_module.so \
             system/vendor/lib/libmmcamera2_cpp_module.so \
             system/vendor/lib/libmmcamera2_iface_modules.so \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index a3346d8..036bc90 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -24,7 +24,6 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/flo/proprietary/hci_qcomm_init:system/bin/hci_qcomm_init:qcom \
     vendor/qcom/flo/proprietary/irsc_util:system/bin/irsc_util:qcom \
     vendor/qcom/flo/proprietary/ks:system/bin/ks:qcom \
-    vendor/qcom/flo/proprietary/mm-pp-daemon:system/bin/mm-pp-daemon:qcom \
     vendor/qcom/flo/proprietary/mm-qcamera-app:system/bin/mm-qcamera-app:qcom \
     vendor/qcom/flo/proprietary/mm-qcamera-daemon:system/bin/mm-qcamera-daemon:qcom \
     vendor/qcom/flo/proprietary/mm-qjpeg-enc-test:system/bin/mm-qjpeg-enc-test:qcom \
@@ -43,32 +42,34 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/flo/proprietary/usbhub:system/bin/usbhub:qcom \
     vendor/qcom/flo/proprietary/usbhub_init:system/bin/usbhub_init:qcom \
     vendor/qcom/flo/proprietary/DxHDCP.cfg:system/etc/DxHDCP.cfg:qcom \
+    vendor/qcom/flo/proprietary/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw:qcom \
     vendor/qcom/flo/proprietary/vidc.b00:system/etc/firmware/vidc.b00:qcom \
     vendor/qcom/flo/proprietary/vidc.b01:system/etc/firmware/vidc.b01:qcom \
     vendor/qcom/flo/proprietary/vidc.b02:system/etc/firmware/vidc.b02:qcom \
     vendor/qcom/flo/proprietary/vidc.b03:system/etc/firmware/vidc.b03:qcom \
-    vendor/qcom/flo/proprietary/vidc.mdt:system/etc/firmware/vidc.mdt:qcom \
-    vendor/qcom/flo/proprietary/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw:qcom \
     vendor/qcom/flo/proprietary/vidcfw.elf:system/etc/firmware/vidcfw.elf:qcom \
+    vendor/qcom/flo/proprietary/vidc.mdt:system/etc/firmware/vidc.mdt:qcom \
+    vendor/qcom/flo/proprietary/gps.conf:system/etc/gps.conf:qcom \
     vendor/qcom/flo/proprietary/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so:qcom \
-    vendor/qcom/flo/proprietary/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so:qcom \
-    vendor/qcom/flo/proprietary/libGLESv1_CM_adreno200.so:system/lib/egl/libGLESv1_CM_adreno200.so:qcom \
-    vendor/qcom/flo/proprietary/libGLESv2_adreno200.so:system/lib/egl/libGLESv2_adreno200.so:qcom \
-    vendor/qcom/flo/proprietary/libq3dtools_adreno200.so:system/lib/egl/libq3dtools_adreno200.so:qcom \
-    vendor/qcom/flo/proprietary/camera.flo.so:system/lib/hw/camera.flo.so:qcom \
+    vendor/qcom/flo/proprietary/libEGL_adreno.so:system/lib/egl/libEGL_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libGLESv1_CM_adreno.so:system/lib/egl/libGLESv1_CM_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libGLESv2_adreno.so:system/lib/egl/libGLESv2_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libplayback_adreno.so:system/lib/egl/libplayback_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libq3dtools_adreno.so:system/lib/egl/libq3dtools_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/flp.msm8960.so:system/lib/hw/flp.msm8960.so:qcom \
     vendor/qcom/flo/proprietary/gps.msm8960.so:system/lib/hw/gps.msm8960.so:qcom \
     vendor/qcom/flo/proprietary/sensors.msm8960.so:system/lib/hw/sensors.msm8960.so:qcom \
-    vendor/qcom/flo/proprietary/libC2D2.so:system/lib/libC2D2.so:qcom \
-    vendor/qcom/flo/proprietary/libCommandSvc.so:system/lib/libCommandSvc.so:qcom \
-    vendor/qcom/flo/proprietary/libDxHdcp.so:system/lib/libDxHdcp.so:qcom \
-    vendor/qcom/flo/proprietary/libI420colorconvert.so:system/lib/libI420colorconvert.so:qcom \
-    vendor/qcom/flo/proprietary/libQSEEComAPI.so:system/lib/libQSEEComAPI.so:qcom \
+    vendor/qcom/flo/proprietary/libadreno_utils.so:system/lib/libadreno_utils.so:qcom \
     vendor/qcom/flo/proprietary/libaudcal.so:system/lib/libaudcal.so:qcom \
     vendor/qcom/flo/proprietary/libaudioalsa.so:system/lib/libaudioalsa.so:qcom \
-    vendor/qcom/flo/proprietary/libc2d2_a3xx.so:system/lib/libc2d2_a3xx.so:qcom \
+    vendor/qcom/flo/proprietary/libC2D2.so:system/lib/libC2D2.so:qcom \
+    vendor/qcom/flo/proprietary/libc2d30-a3xx.so:system/lib/libc2d30-a3xx.so:qcom \
+    vendor/qcom/flo/proprietary/libc2d30.so:system/lib/libc2d30.so:qcom \
+    vendor/qcom/flo/proprietary/libCB.so:system/lib/libCB.so:qcom \
     vendor/qcom/flo/proprietary/libchromatix_ov5693_common.so:system/lib/libchromatix_ov5693_common.so:qcom \
     vendor/qcom/flo/proprietary/libchromatix_ov5693_default_video.so:system/lib/libchromatix_ov5693_default_video.so:qcom \
     vendor/qcom/flo/proprietary/libchromatix_ov5693_preview.so:system/lib/libchromatix_ov5693_preview.so:qcom \
+    vendor/qcom/flo/proprietary/libCommandSvc.so:system/lib/libCommandSvc.so:qcom \
     vendor/qcom/flo/proprietary/libconfigdb.so:system/lib/libconfigdb.so:qcom \
     vendor/qcom/flo/proprietary/libcsd-client.so:system/lib/libcsd-client.so:qcom \
     vendor/qcom/flo/proprietary/libdiag.so:system/lib/libdiag.so:qcom \
@@ -80,29 +81,24 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/flo/proprietary/libdss.so:system/lib/libdss.so:qcom \
     vendor/qcom/flo/proprietary/libdsucsd.so:system/lib/libdsucsd.so:qcom \
     vendor/qcom/flo/proprietary/libdsutils.so:system/lib/libdsutils.so:qcom \
-    vendor/qcom/flo/proprietary/libgeofence.so:system/lib/libgeofence.so:qcom \
     vendor/qcom/flo/proprietary/libgps.utils.so:system/lib/libgps.utils.so:qcom \
     vendor/qcom/flo/proprietary/libgsl.so:system/lib/libgsl.so:qcom \
+    vendor/qcom/flo/proprietary/libI420colorconvert.so:system/lib/libI420colorconvert.so:qcom \
     vendor/qcom/flo/proprietary/libidl.so:system/lib/libidl.so:qcom \
     vendor/qcom/flo/proprietary/libllvm-a3xx.so:system/lib/libllvm-a3xx.so:qcom \
-    vendor/qcom/flo/proprietary/libloc_adapter.so:system/lib/libloc_adapter.so:qcom \
-    vendor/qcom/flo/proprietary/libloc_api_v02.so:system/lib/libloc_api_v02.so:qcom \
+    vendor/qcom/flo/proprietary/libloc_core.so:system/lib/libloc_core.so:qcom \
     vendor/qcom/flo/proprietary/libloc_eng.so:system/lib/libloc_eng.so:qcom \
-    vendor/qcom/flo/proprietary/libmm-abl-oem.so:system/lib/libmm-abl-oem.so:qcom \
     vendor/qcom/flo/proprietary/libmm-abl.so:system/lib/libmm-abl.so:qcom \
-    vendor/qcom/flo/proprietary/libmm-color-convertor.so:system/lib/libmm-color-convertor.so:qcom \
     vendor/qcom/flo/proprietary/libmmcamera2_stats_algorithm.so:system/lib/libmmcamera2_stats_algorithm.so:qcom \
     vendor/qcom/flo/proprietary/libmmcamera_image_stab.so:system/lib/libmmcamera_image_stab.so:qcom \
-    vendor/qcom/flo/proprietary/libmmcamera_interface.so:system/lib/libmmcamera_interface.so:qcom \
     vendor/qcom/flo/proprietary/libmmcamera_mi1040.so:system/lib/libmmcamera_mi1040.so:qcom \
     vendor/qcom/flo/proprietary/libmmcamera_ov5693.so:system/lib/libmmcamera_ov5693.so:qcom \
-    vendor/qcom/flo/proprietary/libmmjpeg_interface.so:system/lib/libmmjpeg_interface.so:qcom \
+    vendor/qcom/flo/proprietary/libmm-color-convertor.so:system/lib/libmm-color-convertor.so:qcom \
     vendor/qcom/flo/proprietary/libnetmgr.so:system/lib/libnetmgr.so:qcom \
     vendor/qcom/flo/proprietary/liboemcrypto.so:system/lib/liboemcrypto.so:qcom \
     vendor/qcom/flo/proprietary/libqcci_legacy.so:system/lib/libqcci_legacy.so:qcom \
     vendor/qcom/flo/proprietary/libqdi.so:system/lib/libqdi.so:qcom \
     vendor/qcom/flo/proprietary/libqdp.so:system/lib/libqdp.so:qcom \
-    vendor/qcom/flo/proprietary/libqmi.so:system/lib/libqmi.so:qcom \
     vendor/qcom/flo/proprietary/libqmi_cci.so:system/lib/libqmi_cci.so:qcom \
     vendor/qcom/flo/proprietary/libqmi_client_qmux.so:system/lib/libqmi_client_qmux.so:qcom \
     vendor/qcom/flo/proprietary/libqmi_common_so.so:system/lib/libqmi_common_so.so:qcom \
@@ -110,7 +106,11 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/flo/proprietary/libqmi_csvt_srvc.so:system/lib/libqmi_csvt_srvc.so:qcom \
     vendor/qcom/flo/proprietary/libqmi_encdec.so:system/lib/libqmi_encdec.so:qcom \
     vendor/qcom/flo/proprietary/libqmiservices.so:system/lib/libqmiservices.so:qcom \
-    vendor/qcom/flo/proprietary/libqomx_core.so:system/lib/libqomx_core.so:qcom \
+    vendor/qcom/flo/proprietary/libqmi.so:system/lib/libqmi.so:qcom \
+    vendor/qcom/flo/proprietary/libQSEEComAPI.so:system/lib/libQSEEComAPI.so:qcom \
+    vendor/qcom/flo/proprietary/librs_adreno_sha1.so:system/lib/librs_adreno_sha1.so:qcom \
+    vendor/qcom/flo/proprietary/librs_adreno.so:system/lib/librs_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libRSDriver_adreno.so:system/lib/libRSDriver_adreno.so:qcom \
     vendor/qcom/flo/proprietary/libsc-a3xx.so:system/lib/libsc-a3xx.so:qcom \
     vendor/qcom/flo/proprietary/libsensor1.so:system/lib/libsensor1.so:qcom \
     vendor/qcom/flo/proprietary/libsensor_reg.so:system/lib/libsensor_reg.so:qcom \
@@ -144,6 +144,11 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/flo/proprietary/gss.b10:system/vendor/firmware/gss.b10:qcom \
     vendor/qcom/flo/proprietary/gss.b11:system/vendor/firmware/gss.b11:qcom \
     vendor/qcom/flo/proprietary/gss.mdt:system/vendor/firmware/gss.mdt:qcom \
+    vendor/qcom/flo/proprietary/keymaster.b00:system/vendor/firmware/keymaster/keymaster.b00:qcom \
+    vendor/qcom/flo/proprietary/keymaster.b01:system/vendor/firmware/keymaster/keymaster.b01:qcom \
+    vendor/qcom/flo/proprietary/keymaster.b02:system/vendor/firmware/keymaster/keymaster.b02:qcom \
+    vendor/qcom/flo/proprietary/keymaster.b03:system/vendor/firmware/keymaster/keymaster.b03:qcom \
+    vendor/qcom/flo/proprietary/keymaster.mdt:system/vendor/firmware/keymaster/keymaster.mdt:qcom \
     vendor/qcom/flo/proprietary/q6.b00:system/vendor/firmware/q6.b00:qcom \
     vendor/qcom/flo/proprietary/q6.b01:system/vendor/firmware/q6.b01:qcom \
     vendor/qcom/flo/proprietary/q6.b03:system/vendor/firmware/q6.b03:qcom \
@@ -163,8 +168,12 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/flo/proprietary/wcnss.mdt:system/vendor/firmware/wcnss.mdt:qcom \
     vendor/qcom/flo/proprietary/libdrmdecrypt.so:system/vendor/lib/libdrmdecrypt.so:qcom \
     vendor/qcom/flo/proprietary/libgemini.so:system/vendor/lib/libgemini.so:qcom \
+    vendor/qcom/flo/proprietary/libgeofence.so:system/vendor/lib/libgeofence.so:qcom \
     vendor/qcom/flo/proprietary/libimage-jpeg-enc-omx-comp.so:system/vendor/lib/libimage-jpeg-enc-omx-comp.so:qcom \
     vendor/qcom/flo/proprietary/libimage-omx-common.so:system/vendor/lib/libimage-omx-common.so:qcom \
+    vendor/qcom/flo/proprietary/libizat_core.so:system/vendor/lib/libizat_core.so:qcom \
+    vendor/qcom/flo/proprietary/libloc_api_v02.so:system/vendor/lib/libloc_api_v02.so:qcom \
+    vendor/qcom/flo/proprietary/libloc_ds_api.so:system/vendor/lib/libloc_ds_api.so:qcom \
     vendor/qcom/flo/proprietary/libmmcamera2_c2d_module.so:system/vendor/lib/libmmcamera2_c2d_module.so:qcom \
     vendor/qcom/flo/proprietary/libmmcamera2_cpp_module.so:system/vendor/lib/libmmcamera2_cpp_module.so:qcom \
     vendor/qcom/flo/proprietary/libmmcamera2_iface_modules.so:system/vendor/lib/libmmcamera2_iface_modules.so:qcom \
diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index 92d0686..5583561 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -1,6 +1,7 @@
 root/adb_keys:google
 system/bin/ATFWD-daemon:qcom
 system/app/AsusDebugger.apk:asus
+system/app/VZ_SDM.apk:asus
 system/etc/DxHDCP.cfg:qcom
 system/vendor/firmware/bcm2079x-b5_firmware.ncd:broadcom
 system/vendor/firmware/bcm2079x-b5_pre_firmware.ncd:broadcom
@@ -35,18 +36,34 @@ system/vendor/firmware/gss.b09:qcom
 system/vendor/firmware/gss.b10:qcom
 system/vendor/firmware/gss.b11:qcom
 system/vendor/firmware/gss.mdt:qcom
+system/vendor/firmware/keymaster/keymaster.b00:qcom
+system/vendor/firmware/keymaster/keymaster.b01:qcom
+system/vendor/firmware/keymaster/keymaster.b02:qcom
+system/vendor/firmware/keymaster/keymaster.b03:qcom
+system/vendor/firmware/keymaster/keymaster.mdt:qcom
 system/bin/hci_qcomm_init:qcom
 system/bin/irsc_util:qcom
 system/bin/ks:qcom
+system/etc/gps.conf:qcom
+system/lib/egl/libEGL_adreno.so:qcom
+system/lib/egl/libGLESv1_CM_adreno.so:qcom
+system/lib/egl/libGLESv2_adreno.so:qcom
+system/lib/egl/libplayback_adreno.so:qcom
+system/lib/egl/libq3dtools_adreno.so:qcom
 system/lib/libAKM.so:asus
+system/lib/libCB.so:qcom
 system/lib/libCommandSvc.so:qcom
 system/lib/libDxHdcp.so:qcom
 system/lib/libI420colorconvert.so:qcom
 system/lib/libQSEEComAPI.so:qcom
+system/lib/libRSDriver_adreno.so:qcom
 system/lib/libacdbdata.so:asus
 system/lib/libacdbloader.so:qcom
+system/lib/libadreno_utils.so:qcom
 system/lib/libaudcal.so:qcom
 system/lib/libaudioalsa.so:qcom
+system/lib/libc2d30-a3xx.so:qcom
+system/lib/libc2d30.so:qcom
 system/lib/libchromatix_ov5693_common.so:qcom
 system/lib/libchromatix_ov5693_default_video.so:qcom
 system/lib/libchromatix_ov5693_preview.so:qcom
@@ -63,9 +80,14 @@ system/lib/libdss.so:qcom
 system/lib/libdsucsd.so:qcom
 system/lib/libdsutils.so:qcom
 system/vendor/lib/libgemini.so:qcom
+system/vendor/lib/libgeofence.so:qcom
 system/vendor/lib/libimage-jpeg-enc-omx-comp.so:qcom
 system/vendor/lib/libimage-omx-common.so:qcom
+system/vendor/lib/libizat_core.so:qcom
+system/vendor/lib/libloc_api_v02.so:qcom
+system/vendor/lib/libloc_ds_api.so:qcom
 system/lib/libloc_api_v02.so:qcom
+system/lib/libloc_core.so:qcom
 system/lib/libmm-abl.so:qcom
 system/lib/libmm-abl-oem.so:qcom
 system/lib/libmm-color-convertor.so:qcom
@@ -87,6 +109,8 @@ system/vendor/lib/libmmstillomx.so:qcom
 system/lib/libnetmgr.so:qcom
 system/vendor/lib/liboemcamera.so:qcom
 system/lib/liboemcrypto.so:qcom
+system/lib/librs_adreno_sha1.so:qcom
+system/lib/librs_adreno.so:qcom
 system/lib/libqcci_legacy.so:qcom
 system/lib/libqdi.so:qcom
 system/lib/libqdp.so:qcom
@@ -123,6 +147,7 @@ system/bin/qmuxd:qcom
 system/bin/qseecomd:qcom
 system/bin/radish:qcom
 system/bin/rmt_storage:qcom
+system/lib/hw/flp.msm8960.so:qcom
 system/lib/hw/sensors.msm8960.so:qcom
 system/bin/sensors.qcom:qcom
 system/bin/thermald:qcom
diff --git a/wpa_supplicant_overlay.conf b/wpa_supplicant_overlay.conf
index acbace2..f9f5541 100644
--- a/wpa_supplicant_overlay.conf
+++ b/wpa_supplicant_overlay.conf
@@ -1 +1,2 @@
 disable_scan_offload=1
+tdls_external_control=1