Merge "Enable RT threads by default for Edgetpu DBA HAL." into udc-dev
diff --git a/dauntless/sepolicy/vndservicemanager.te b/dauntless/sepolicy/vndservicemanager.te
new file mode 100644
index 0000000..335cd2b
--- /dev/null
+++ b/dauntless/sepolicy/vndservicemanager.te
@@ -0,0 +1 @@
+binder_call(vndservicemanager, hal_keymint_citadel)
diff --git a/edgetpu/sepolicy/edgetpu_vendor_server.te b/edgetpu/sepolicy/edgetpu_vendor_server.te
index 1060510..4c03744 100644
--- a/edgetpu/sepolicy/edgetpu_vendor_server.te
+++ b/edgetpu/sepolicy/edgetpu_vendor_server.te
@@ -29,3 +29,6 @@
# Allow EdgeTPU vendor service to read the overcommit_memory info.
allow edgetpu_vendor_server proc_overcommit_memory:file r_file_perms;
+
+# Allow EdgeTPU vendor service to read hetero runtime properties
+get_prop(edgetpu_vendor_server, vendor_hetero_runtime_prop)
diff --git a/edgetpu/sepolicy/service.te b/edgetpu/sepolicy/service.te
index be06e04..a61c8f8 100644
--- a/edgetpu/sepolicy/service.te
+++ b/edgetpu/sepolicy/service.te
@@ -1,6 +1,6 @@
-type edgetpu_nnapi_service, app_api_service, service_manager_type;
+type edgetpu_nnapi_service, app_api_service, service_manager_type, isolated_compute_allowed_service;
type edgetpu_vendor_service, service_manager_type, hal_service_type;
-type edgetpu_dba_service, app_api_service, service_manager_type;
+type edgetpu_dba_service, app_api_service, service_manager_type, isolated_compute_allowed_service;
# EdgeTPU binder service type declaration.
type edgetpu_app_service, service_manager_type;
diff --git a/gps/brcm/prebuilt/SensorHub.patch b/gps/brcm/prebuilt/SensorHub.patch
index e5edb5a..9ee3e90 100644
--- a/gps/brcm/prebuilt/SensorHub.patch
+++ b/gps/brcm/prebuilt/SensorHub.patch
@@ -1,9 +1,9 @@
<FormatVersion=0x00010003>
-<Crc=162>
+<Crc=202>
<BlobLength=161839>
<AsicVersion=0x004776A0>
-<ChangeList=566805>
+<ChangeList=568380>
<PatchLevel=0>
<PostPatchLevel=1>
<CustomerVersion=None>
@@ -79,7 +79,7 @@
009102A101F438F703B000BD4170700080BD8900708989
00805D8A006905800025643A2564095374617274206368
70704170705461736B0A00000000633A5C77735C626F64
-5F3437373631333136375F3536363830355C637573746F
+5F3437373631333333345F3536383338305C637573746F
6D6572735C676F6F676C655C503231466C61677461696C
6D63755C64656C69766572795C53656E736F724875625F
5032315C7372635C6875625F636F6E74726F6C6C65722E
@@ -390,7 +390,7 @@
F22046FEF700FF07E002464FF4D1630FF2F4518F2011F4
5FF2FEF769FC04F5A6620A23C2E9000105F0F00006F00F
0101433A462046BDE8F041FFF7BDBB0000633A5C77735C
-626F645F3437373631333136375F3536363830355C6375
+626F645F3437373631333333345F3536383338305C6375
73746F6D6572735C676F6F676C655C503231466C616774
61696C6D63755C64656C69766572795C53656E736F7248
75625F5032315C7372635C636870705C7472616E73706F
@@ -526,7 +526,7 @@
25210378204626F4F1F510B010BD000025643A25640948
232568687520756E6B6E6F776E20726571756573742E20
636D643D2523782C2049443D256868750A00633A5C7773
-5C626F645F3437373631333136375F3536363830355C63
+5C626F645F3437373631333333345F3536383338305C63
7573746F6D6572735C676F6F676C655C503231466C6167
7461696C6D63755C64656C69766572795C53656E736F72
4875625F5032315C7372F19403502E8000635C63687070
@@ -585,7 +585,7 @@
D803B000BDF07E8A000C53890028878A00113280009D32
800025643A256409434850502042617564726174652069
732073657420746F20256C640A0A00633A5C77735C626F
-645F3437373631333136375F3536363830355C63757374
+645F3437373631333333345F3536383338305C63757374
6F6D6572735C676F6F676C655C503231466C6167746169
6C6D63755C64656C69766572795C53656E736F72487562
5F5032315C7372635C73656E736F725F6875622E630000
@@ -679,13 +679,13 @@
B5C90382B0A0F5A86419D500F65C552846FDF7F6DD0600
12D00020009069462846FDF712DE761E012804DB024600
992046FEF79EF82846FDF76FDD002EECD173BD70470000
-633A5C77735C626F645F3437373631333136375F353636
-3830355C637573746F6D6572735C676F6F676C655C5032
+633A5C77735C626F645F3437373631333333345F353638
+3338305C637573746F6D6572735C676F6F676C655C5032
31466C61677461696C6D63755C64656C69766572795C53
656E736F724875625F5032315C7372635C636870705C69
6E636C7564655C636870702F7472616E73706F72742E68
-00633A5C77735C626F645F3437373631333136375F3536
-363830355C637573746F6D6572735C676F6F676C655C50
+00633A5C77735C626F645F3437373631333333345F3536
+383338305C637573746F6D6572735C676F6F676C655C50
3231466C61677461696C6D63755C64656C69766572795C
53656E736F724875625F5032315C7372635C636870705C
706C6174666F726D5C62636D5C42434D343737785C6C69
@@ -696,7 +696,7 @@
D1D6E90223D0E918679F42E7D8E8D39642E4D2E5E7D0E9
1823CDE900230FF27C010FF2100240F21E238F200FF4B1
F403B0F0BD0000633A5C77735C626F645F343737363133
-3136375F3536363830355C637573746F6D6572735C676F
+3333345F3536383338305C637573746F6D6572735C676F
6F676C655C503231466C61677461696C6D63755C64656C
69766572795C53656E736F724875625F5032315C737263
5C636870705C636C69656E74732E630000000025643A25
@@ -706,7 +706,7 @@
21FEF75DF80AE03246294625F420F40120787032462068
3946FEF718F8012003B0F0BD25643A2564094F4F4D2061
742025733A25640A00633A5C77735C626F645F34373736
-31333136375F3536363830355C637573746F6D6572735C
+31333333345F3536383338305C637573746F6D6572735C
676F6F676C655C503231466C61677461696C6D63755C64
656C69766572795C53656E736F724875625F5032315C73
72635C636870705C73657276696365735C6C6F6F706261
@@ -718,8 +718,8 @@
0122460E2000908F200FF2B0010FF4C3F32868314604B0
BDE870400E22FDF78CBF10B58B880124012B02D1FFF7BE
FF00E00024204610BD25643A2564094F4F4D2061742025
-733A25640A00633A5C77735C626F645F34373736313331
-36375F3536363830355C637573746F6D6572735C676F6F
+733A25640A00633A5C77735C626F645F34373736313333
+33345F3536383338305C637573746F6D6572735C676F6F
676C655C503231466C61677461696C6D63755C64656C69
766572795C53656E736F724875625F5032315C7372635C
636870705C73657276696365735C74696D6573796E632E
@@ -734,7 +734,7 @@
314603B0BDE8F043FDF7E2BE10B58A880124012A02D1FF
F7BAFF00E00024204610BD25643A2564094F4F4D206174
2025733A25640A00633A5C77735C626F645F3437373631
-333136375F3536363830355C637573746F6D6572735C67
+333333345F3536383338305C637573746F6D6572735C67
6F6F676C655C503231466C61677461696C6D63755C6465
6C69766572795C53656E736F724875625F5032315C7372
635C636870705C73657276696365735C646973636F7665
@@ -761,7 +761,7 @@
05CDE90445AD230FF2AC118F200FF4D8F106B0BDE87083
70B50446084615461E46FFF7BEFF3246294620680068BD
E87040FDF797BD00000000633A5C77735C626F645F3437
-373631333136375F3536363830355C637573746F6D6572
+373631333333345F3536383338305C637573746F6D6572
735C676F6F676C655C503231466C61677461696C6D6375
5C64656C69766572795C53656E736F724875625F503231
5C7372635C636870705C73657276696365732E63000000
@@ -788,8 +788,8 @@
230FF240020FF22C018E2007E001A8009042230FF22C02
0FF218018F200FF49DF00DF5027D10BC5DF80CFB0FF284
014160704725643A25640950414C3A2025730A0000633A
-5C77735C626F645F3437373631333136375F3536363830
-355C637573746F6D6572735C676F6F676C655C50323146
+5C77735C626F645F3437373631333333345F3536383338
+305C637573746F6D6572735C676F6F676C655C50323146
6C61677461696C6D63755C64656C69766572795C53656E
736F724875625F5032315C7372635C636870705C706C61
74666F726D5C70616C5F6170692E6300000000000001C9
@@ -848,7 +848,7 @@
32BD13460A4601460248007810F469B000001453890055
47800065478000687B890060D09100354780002B488000
436870704C696E6B5461736B00000000633A5C77735C62
-6F645F3437373631333136375F3536363830355C637573
+6F645F3437373631333333345F3536383338305C637573
746FF19403D04A80006D6572735C676F6F676C655C5032
31466C61677461696C6D63755C64656C69766572795C53
656E736F724875625F5032315C7372635C636870705C70
@@ -914,7 +914,7 @@
0023002240F293210FF2380001B0BDE83040FBF732BB31
BD0000D088890025643A256409474E5353207365727669
636520616C7265616479206F70656E0A00000000633A5C
-77735C626F645F3437373631333136375F353636383035
+77735C626F645F3437373631333333345F353638333830
5C637573746F6D6572735C676F6F676C655C503231466C
61677461696C6D63755C64656C69766572795C53656E73
6F724875625F5032315C7372635C636870705C73657276
@@ -965,7 +965,7 @@
0023002295210FF23000FBF7EFF836B90023002296210F
F22000FBF7E7F83620FEF78EF9286030B1811D2046FFF7
99FF36203060012070BD633A5C77735C626F645F343737
-3631333136375F3536363830355C637573746F6D657273
+3631333333345F3536383338305C637573746F6D657273
5C676F6F676C655C503231466C61677461696C6D63755C
64656C69766572795C53656E736F724875625F5032315C
7372635C636870705C636F6D6D6F6E5C676E73735F63F1
@@ -1020,7 +1020,7 @@
0025643A2564095B25735D204D6561737572656D656E74
2064617461206576656E74203A206D6561737572656D65
6E745F636F756E74203D20282564290A000000633A5C77
-735C626F645F3437373631333136375F3536363830355C
+735C626F645F3437373631333333345F3536383338305C
637573746F6D6572735C676F6F676C655C503231466C61
677461696C6D63755C64656C69766572795C53656E736F
724875625F5032315C7372635C636870705C706C617466
@@ -1229,7 +1229,7 @@
8891FBF0F111FB00F008E0B08838B1A88070BD00291CBF
F088002800D0A08070BD0B480170704700000948007870
4700000848017070470000064800787047000001484161
-70470000787B890015A6080099CB91009ACB91002F2F64
+70470000787B89003CAC080099CB91009ACB91002F2F64
65706F742F636C69656E742F636F72652F72656C2F476F
6F676C652F5032322F3535343830332F2E2E2E0000007E
24247E5056542044756D70203A20474C4C207665722E20
diff --git a/gps/brcm/prebuilt/android.hardware.gnss@2.1-impl-google.so b/gps/brcm/prebuilt/android.hardware.gnss@2.1-impl-google.so
index 80735cf..e42bf07 100755
--- a/gps/brcm/prebuilt/android.hardware.gnss@2.1-impl-google.so
+++ b/gps/brcm/prebuilt/android.hardware.gnss@2.1-impl-google.so
Binary files differ
diff --git a/gps/brcm/prebuilt/android.hardware.gnss@2.1-service-brcm b/gps/brcm/prebuilt/android.hardware.gnss@2.1-service-brcm
index a9cc96b..327d97f 100755
--- a/gps/brcm/prebuilt/android.hardware.gnss@2.1-service-brcm
+++ b/gps/brcm/prebuilt/android.hardware.gnss@2.1-service-brcm
Binary files differ
diff --git a/gps/brcm/prebuilt/flp.default.so b/gps/brcm/prebuilt/flp.default.so
index ae80542..a4678d1 100755
--- a/gps/brcm/prebuilt/flp.default.so
+++ b/gps/brcm/prebuilt/flp.default.so
Binary files differ
diff --git a/gps/brcm/prebuilt/gps.default.so b/gps/brcm/prebuilt/gps.default.so
index c37db08..8257bcb 100755
--- a/gps/brcm/prebuilt/gps.default.so
+++ b/gps/brcm/prebuilt/gps.default.so
Binary files differ
diff --git a/gps/brcm/prebuilt/gpsd b/gps/brcm/prebuilt/gpsd
index 3026af5..b13622b 100755
--- a/gps/brcm/prebuilt/gpsd
+++ b/gps/brcm/prebuilt/gpsd
Binary files differ
diff --git a/gps/brcm/prebuilt/lhd b/gps/brcm/prebuilt/lhd
index 251ca2e..04a3a3f 100755
--- a/gps/brcm/prebuilt/lhd
+++ b/gps/brcm/prebuilt/lhd
Binary files differ
diff --git a/gps/brcm/prebuilt/scd b/gps/brcm/prebuilt/scd
index 44e17a9..adcb7df 100755
--- a/gps/brcm/prebuilt/scd
+++ b/gps/brcm/prebuilt/scd
Binary files differ
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
+