Commit: 2eed4e42cd62987eda80be5d5fed7605084534c3 - device-generic-common (git)

device/generic/common

Commit MetaInfo

• Revision: 2eed4e42cd62987eda80be5d5fed7605084534c3 (tree)
• Time: 2015-07-17 03:56:50
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

init.sh: add support of iio sensors

Change Summary

• modified: device.mk
• modified: init.sh

Incremental Difference

--- a/device.mk
+++ b/device.mk
@@ -54,11 +54,12 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
     frameworks/native/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
     frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
-    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
-    frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
-    frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
-    frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
     frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
+    frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
+    frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
+    frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
+    frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
+    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \

--- a/init.sh
+++ b/init.sh
@@ -20,6 +20,7 @@ function init_misc()
 
 	case "$PRODUCT" in
 		T10*TA)
+			modprobe ak8975
 			;;
 		*)
 			;;
@@ -206,11 +207,9 @@ function init_hal_sensors()
 
 	# has sensor-hub?
 	for i in /sys/bus/iio/devices/iio:device?; do
-		if [ -e $i/in_accel_scale ]; then
-			busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device?/
-			hal_sensors=hsb
-			break
-		fi
+		busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device?/
+		lsmod | grep -q hid_sensor_accel_3d && hal_sensors=hsb || hal_sensors=iio
+		break
 	done
 
 	set_property ro.hardware.sensors $hal_sensors