DO NOT MERGE gps: update gps driver 147.20.23.554803 am: 19c70e1342
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/20499008
Change-Id: I2b2e86de8f189300f1ef1f125a834c7157b864bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index cb8072d..9b5e8a5 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -341,9 +341,6 @@
BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x04000000
BOARD_DTBOIMG_PARTITION_SIZE := 0x01000000
-# System As Root
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
-
# Vendor ramdisk image for kernel development
BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 35ab767..4241468 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -874,7 +874,8 @@
service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 \
-r /dev/sg1 -p /data/vendor/ss -t ufs
class early_hal
- user root
+ user system
+ group system
# Write build info to kdebuginfo
on property:ro.build.fingerprint=*
diff --git a/confirmationui/confirmationui.mk b/confirmationui/confirmationui.mk
index 85f77c9..8607ce4 100644
--- a/confirmationui/confirmationui.mk
+++ b/confirmationui/confirmationui.mk
@@ -1,6 +1,6 @@
# Trusty ConfirmationUI HAL
PRODUCT_PACKAGES += \
- android.hardware.confirmationui@1.0-service.trusty.vendor
+ android.hardware.confirmationui-service.trusty.vendor
# Trusty Secure DPU Daemon
PRODUCT_PACKAGES += \
diff --git a/device.mk b/device.mk
index e05cf81..9e32849 100644
--- a/device.mk
+++ b/device.mk
@@ -646,6 +646,7 @@
debug.hwc.winupdate=1
# hw composer HAL
+$(call soong_config_set,google_displaycolor,displaycolor_platform,gs101)
PRODUCT_PACKAGES += \
libdisplaycolor \
hwcomposer.$(TARGET_BOARD_PLATFORM)
diff --git a/dumpstate/OWNERS b/dumpstate/OWNERS
new file mode 100644
index 0000000..c6adf31
--- /dev/null
+++ b/dumpstate/OWNERS
@@ -0,0 +1,10 @@
+aaronding@google.com
+rurumihong@google.com
+adamshih@google.com
+wilsonsung@google.com
+lucaswei@google.com
+cyanhsieh@google.com
+rogerliao@google.com
+cyuanjen@google.com
+robinpeng@google.com
+
diff --git a/dumpstate/README.txt b/dumpstate/README.txt
new file mode 100644
index 0000000..b279bda
--- /dev/null
+++ b/dumpstate/README.txt
@@ -0,0 +1 @@
+Please refer to go/pixel-recycle to modularize your code in this space.
diff --git a/fingerprint/extension/Android.bp b/fingerprint/extension/Android.bp
index fa2f13e..f36f3d5 100644
--- a/fingerprint/extension/Android.bp
+++ b/fingerprint/extension/Android.bp
@@ -8,7 +8,7 @@
}
sh_binary {
- name: "fingerprint.extension.sh",
+ name: "fingerprint.extension",
init_rc: ["init.fingerprint.extension.rc"],
src: "fingerprint.extension.sh",
system_ext_specific: true,
diff --git a/fingerprint/extension/fingerprint.extension.mk b/fingerprint/extension/fingerprint.extension.mk
index 1ef2374..1b8270a 100644
--- a/fingerprint/extension/fingerprint.extension.mk
+++ b/fingerprint/extension/fingerprint.extension.mk
@@ -1,11 +1,10 @@
# Fingerprint extension feature
ifneq (,$(filter userdebug, $(TARGET_BUILD_VARIANT)))
-SOONG_CONFIG_fp_hal_feature += report_bug_support
-SOONG_CONFIG_fp_hal_feature_report_bug_support := true
+$(call soong_config_set,fp_hal_feature,report_bug_support,true)
BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/vendor/
SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/public/
SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/private/
PRODUCT_PACKAGES += \
fps_ext_bug_lib \
- fingerprint.extension.sh
+ fingerprint.extension
endif
diff --git a/fingerprint/extension/init.fingerprint.extension.rc b/fingerprint/extension/init.fingerprint.extension.rc
index 9277ce0..70bcfd2 100644
--- a/fingerprint/extension/init.fingerprint.extension.rc
+++ b/fingerprint/extension/init.fingerprint.extension.rc
@@ -1,18 +1,18 @@
# init-fingerprint-extension-sh is to send intent command to app
# for tracking fingerprint issue.
-service fingerprint-extension-bug-latency /system_ext/bin/fingerprint.extension.sh latency
+service fingerprint-extension-bug-latency /system_ext/bin/fingerprint.extension latency
group shell
user shell
disabled
oneshot
-service fingerprint-extension-bug-lockout /system_ext/bin/fingerprint.extension.sh lockout
+service fingerprint-extension-bug-lockout /system_ext/bin/fingerprint.extension lockout
group shell
user shell
disabled
oneshot
-service fingerprint-extension-bug-auth /system_ext/bin/fingerprint.extension.sh auth
+service fingerprint-extension-bug-auth /system_ext/bin/fingerprint.extension auth
group shell
user shell
disabled
diff --git a/manifest.xml b/manifest.xml
index 51f3345..09fbd8a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -133,14 +133,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl">
- <name>vendor.google.google_battery</name>
- <version>1</version>
- <interface>
- <name>IGoogleBattery</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<transport>hwbinder</transport>
diff --git a/manifest_64.xml b/manifest_64.xml
index 5d33f74..4edb2e9 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -116,14 +116,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl">
- <name>vendor.google.google_battery</name>
- <version>1</version>
- <interface>
- <name>IGoogleBattery</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<transport>hwbinder</transport>