From 01f2b018ccabd9a7f904ace2129aa7b544a98bd2 Mon Sep 17 00:00:00 2001
From: Peng Xu <pengxu@google.com>
Date: Tue, 17 Oct 2017 18:44:57 -0700
Subject: [PATCH] Store sensor HAL properties in vendor partition

This CL moves storage of ro.qti.sensors.* properties to vendor
partition to ensure that they will remain the same for sensor HAL to
function correctly after AOSP system image swap.

Test: ro.qti.sensors.* properties exist in /vendor/build.prop
Test: adb shell getprop |grep qti.sensors remains the same
Test: adb shell dumpsys sensorservice does not include -Wakeup Secondary
      sensors in sensor list as before
Bug: 67746417
Change-Id: Idcc770cc864b89f1585e42c1146f0fc091372f6d
---
 device.mk   | 23 +++++++++++++++++++++++
 system.prop | 19 ++-----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/device.mk b/device.mk
index 0625da7a..e5758887 100755
--- a/device.mk
+++ b/device.mk
@@ -227,6 +227,29 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
   ro.vendor.extension_library=libqti-perfd-client.so
 
+# settings to enable Device Orientation Sensors
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.qti.sensors.dev_ori=true
+
+# settings to disable unused secondary wakeup
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.qti.sensors.wu=false
+
+# settings to disable unused algorithms
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.qti.sdk.sensors.gestures=false \
+    ro.qti.sensors.amd=false \
+    ro.qti.sensors.cmc=false \
+    ro.qti.sensors.facing=false \
+    ro.qti.sensors.pedometer=false \
+    ro.qti.sensors.rmd=false \
+    ro.qti.sensors.scrn_ortn=false
+
+# use SMGR supplied version of step detector and counter
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.qti.sensors.step_counter=false \
+    ro.qti.sensors.step_detector=false
+
 # camera gyro and laser sensor
 PRODUCT_PROPERTY_OVERRIDES += \
   persist.camera.gyro.android=20 \
diff --git a/system.prop b/system.prop
index be0351b3..98af2088 100644
--- a/system.prop
+++ b/system.prop
@@ -49,23 +49,8 @@ telephony.lteOnCdmaDevice=1
 # Simulate sdcard on /data/media
 persist.fuse_sdcard=true
 
-# settings to enable Device Orientation Sensors
-ro.qti.sensors.dev_ori=true
-
-# settings to disable sensors not needed
-# all secondary wakeup
-ro.qti.sensors.wu=false
-# unused algorithms
-ro.qti.sdk.sensors.gestures=false
-ro.qti.sensors.amd=false
-ro.qti.sensors.cmc=false
-ro.qti.sensors.facing=false
-ro.qti.sensors.pedometer=false
-ro.qti.sensors.rmd=false
-ro.qti.sensors.scrn_ortn=false
-# use SMGR supplied verison
-ro.qti.sensors.step_counter=false
-ro.qti.sensors.step_detector=false
+# sensor properties are moved to device.mk
+#
 
 #system prop for RmNet Data
 persist.rmnet.data.enable=true