Merge "Allow nnapi for isolated_compute_app" into udc-dev
diff --git a/gps/brcm/sepolicy/gpsd.te b/gps/brcm/sepolicy/gpsd.te
index 2e5a497..7b566f9 100644
--- a/gps/brcm/sepolicy/gpsd.te
+++ b/gps/brcm/sepolicy/gpsd.te
@@ -16,5 +16,8 @@
binder_call(gpsd, system_server);
allow gpsd fwk_sensor_hwservice:hwservice_manager find;
+# android.frameworks.sensorservice through libsensorndkbridge
+allow gpsd fwk_sensor_service:service_manager find;
+
# Allow gpsd to access pps gpio
allow gpsd sysfs_gps_assert:file r_file_perms;
diff --git a/gps/dump/dump_gps.cpp b/gps/dump/dump_gps.cpp
index d7ece62..d569f9b 100644
--- a/gps/dump/dump_gps.cpp
+++ b/gps/dump/dump_gps.cpp
@@ -22,6 +22,8 @@
#define GPS_TMP_LOG_DIRECTORY "/data/vendor/gps/logs/.tmp"
#define GPS_LOG_PREFIX "gl-"
#define GPS_MCU_LOG_PREFIX "esw-"
+#define GPS_MALLOC_LOG_DIRECTORY "/data/vendor/gps"
+#define GPS_MALLOC_LOG_PREFIX "malloc_"
int main() {
if(!::android::base::GetBoolProperty("vendor.gps.aol.enabled", false)) {
@@ -38,6 +40,7 @@
dumpLogs(GPS_TMP_LOG_DIRECTORY, outputDir.c_str(), 1, GPS_LOG_PREFIX);
dumpLogs(GPS_LOG_DIRECTORY, outputDir.c_str(), 3, GPS_MCU_LOG_PREFIX);
dumpLogs(GPS_LOG_DIRECTORY, outputDir.c_str(), maxFileNum, GPS_LOG_PREFIX);
+ dumpLogs(GPS_MALLOC_LOG_DIRECTORY, outputDir.c_str(), 1, GPS_MALLOC_LOG_PREFIX);
return 0;
}
diff --git a/touch/gti/Android.bp b/touch/gti/Android.bp
index d21314a..c066d0d 100644
--- a/touch/gti/Android.bp
+++ b/touch/gti/Android.bp
@@ -3,9 +3,17 @@
}
sh_binary {
- name: "dump_gti.sh",
- src: "dump_gti.sh",
- init_rc: ["init.touch.gti.rc"],
+ name: "dump_gti0.sh",
+ src: "dump_gti0.sh",
+ init_rc: ["init.touch.gti0.rc"],
+ vendor: true,
+ sub_dir: "dump",
+}
+
+sh_binary {
+ name: "dump_gti1.sh",
+ src: "dump_gti1.sh",
+ init_rc: ["init.touch.gti1.rc"],
vendor: true,
sub_dir: "dump",
}
diff --git a/touch/gti/dump_gti.sh b/touch/gti/dump_gti0.sh
similarity index 89%
rename from touch/gti/dump_gti.sh
rename to touch/gti/dump_gti0.sh
index a7d3a61..40886e0 100644
--- a/touch/gti/dump_gti.sh
+++ b/touch/gti/dump_gti0.sh
@@ -14,6 +14,12 @@
echo "------ Touch Firmware Version ------"
cat $path/fw_ver
+echo "------ Panel ID ------"
+cat $path/panel_id
+
+echo "------ Offload ID ------"
+cat $path/offload_id
+
echo "------ Get Mutual Sensing Data - Baseline ------"
cat $heatmap_path/ms_base
diff --git a/touch/gti/dump_gti.sh b/touch/gti/dump_gti1.sh
similarity index 80%
copy from touch/gti/dump_gti.sh
copy to touch/gti/dump_gti1.sh
index a7d3a61..79aa5fb 100644
--- a/touch/gti/dump_gti.sh
+++ b/touch/gti/dump_gti1.sh
@@ -1,6 +1,6 @@
#!/vendor/bin/sh
-path="/sys/devices/virtual/goog_touch_interface/gti.0"
-procfs_path="/proc/goog_touch_interface/gti.0"
+path="/sys/devices/virtual/goog_touch_interface/gti.1"
+procfs_path="/proc/goog_touch_interface/gti.1"
if [[ -d "$procfs_path" ]]; then
heatmap_path=$procfs_path
@@ -14,6 +14,12 @@
echo "------ Touch Firmware Version ------"
cat $path/fw_ver
+echo "------ Panel ID ------"
+cat $path/panel_id
+
+echo "------ Offload ID ------"
+cat $path/offload_id
+
echo "------ Get Mutual Sensing Data - Baseline ------"
cat $heatmap_path/ms_base
diff --git a/touch/gti/gti.mk b/touch/gti/gti.mk
index e2e42bd..171534f 100644
--- a/touch/gti/gti.mk
+++ b/touch/gti/gti.mk
@@ -1,3 +1,3 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/gti/sepolicy
-PRODUCT_PACKAGES += dump_gti.sh
+PRODUCT_PACKAGES += dump_gti0.sh
diff --git a/touch/gti/gti_dual.mk b/touch/gti/gti_dual.mk
new file mode 100644
index 0000000..f56645d
--- /dev/null
+++ b/touch/gti/gti_dual.mk
@@ -0,0 +1,5 @@
+include device/google/gs-common/touch/gti/gti.mk
+
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/gti/sepolicy_gti_dual
+
+PRODUCT_PACKAGES += dump_gti1.sh
diff --git a/touch/gti/init.touch.gti.rc b/touch/gti/init.touch.gti.rc
deleted file mode 100644
index d714a97..0000000
--- a/touch/gti/init.touch.gti.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-on property:vendor.device.modules.ready=1
- chown system system /proc/goog_touch_interface
- chown system system /proc/goog_touch_interface/gti.0
- chown system system /proc/goog_touch_interface/gti.0/ms_base
- chown system system /proc/goog_touch_interface/gti.0/ms_diff
- chown system system /proc/goog_touch_interface/gti.0/ms_raw
- chown system system /proc/goog_touch_interface/gti.0/ss_base
- chown system system /proc/goog_touch_interface/gti.0/ss_diff
- chown system system /proc/goog_touch_interface/gti.0/ss_raw
diff --git a/touch/gti/init.touch.gti0.rc b/touch/gti/init.touch.gti0.rc
new file mode 100644
index 0000000..5489ff8
--- /dev/null
+++ b/touch/gti/init.touch.gti0.rc
@@ -0,0 +1,23 @@
+on property:vendor.device.modules.ready=1
+ # Sysfs
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/force_active
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/fw_ver
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/panel_id
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/offload_id
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ms_base
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ms_diff
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ms_raw
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/self_test
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_base
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_diff
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_raw
+
+ # Procfs
+ chown system system /proc/goog_touch_interface
+ chown system system /proc/goog_touch_interface/gti.0
+ chown system system /proc/goog_touch_interface/gti.0/ms_base
+ chown system system /proc/goog_touch_interface/gti.0/ms_diff
+ chown system system /proc/goog_touch_interface/gti.0/ms_raw
+ chown system system /proc/goog_touch_interface/gti.0/ss_base
+ chown system system /proc/goog_touch_interface/gti.0/ss_diff
+ chown system system /proc/goog_touch_interface/gti.0/ss_raw
diff --git a/touch/gti/init.touch.gti1.rc b/touch/gti/init.touch.gti1.rc
new file mode 100644
index 0000000..28c8204
--- /dev/null
+++ b/touch/gti/init.touch.gti1.rc
@@ -0,0 +1,23 @@
+on property:vendor.device.modules.ready=1
+ # Sysfs
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/force_active
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/fw_ver
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/panel_id
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/offload_id
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/ms_base
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/ms_diff
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/ms_raw
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/self_test
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/ss_base
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/ss_diff
+ chown system system /sys/devices/virtual/goog_touch_interface/gti.1/ss_raw
+
+ # Procfs
+ chown system system /proc/goog_touch_interface
+ chown system system /proc/goog_touch_interface/gti.1
+ chown system system /proc/goog_touch_interface/gti.1/ms_base
+ chown system system /proc/goog_touch_interface/gti.1/ms_diff
+ chown system system /proc/goog_touch_interface/gti.1/ms_raw
+ chown system system /proc/goog_touch_interface/gti.1/ss_base
+ chown system system /proc/goog_touch_interface/gti.1/ss_diff
+ chown system system /proc/goog_touch_interface/gti.1/ss_raw
diff --git a/touch/gti/sepolicy/file_contexts b/touch/gti/sepolicy/file_contexts
index cbddadf..5c429b7 100644
--- a/touch/gti/sepolicy/file_contexts
+++ b/touch/gti/sepolicy/file_contexts
@@ -1,2 +1,2 @@
-/vendor/bin/dump/dump_gti\.sh u:object_r:dump_gti_exec:s0
+/vendor/bin/dump/dump_gti0\.sh u:object_r:dump_gti_exec:s0
diff --git a/touch/gti/sepolicy_gti_dual/file_contexts b/touch/gti/sepolicy_gti_dual/file_contexts
new file mode 100644
index 0000000..21c4064
--- /dev/null
+++ b/touch/gti/sepolicy_gti_dual/file_contexts
@@ -0,0 +1,2 @@
+/vendor/bin/dump/dump_gti1\.sh u:object_r:dump_gti_exec:s0
+
