Add prebuilt protobuf 3.9.1 to vendor partition. am: 92279eac8b
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2299937
Change-Id: I37df7f350651c4e423a41b0d4484fd7cf46fad0d
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 90c47d0..146c6fa 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -52,6 +52,7 @@
BOARD_KERNEL_CMDLINE += loop.max_part=7
BOARD_KERNEL_CMDLINE += androidboot.usbcontroller=a600000.dwc3 swiotlb=1
BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/1d84000.ufshc
+BOARD_KERNEL_CMDLINE += cgroup_disable=pressure
#BOARD_KERNEL_CMDLINE += video=vfb:640x400,bpp=32,memsize=3072000 service_locator.enable=1 earlycon=msm_geni_serial,0x880000
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index b792545..8220a52 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -71,9 +71,9 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="true">
+ <hal format="aidl" optional="true">
<name>vendor.google.google_battery</name>
- <version>1.2</version>
+ <version>1</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>
diff --git a/init.hardware.rc b/init.hardware.rc
index f994731..546612e 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -443,6 +443,10 @@
on property:sys.boot_completed=1
setprop vendor.setup.power 1
+ # Permission for Pixelstats
+ chown system system /dev/sys/fs/by-name/userdata/gc_segment_mode
+ chown system system /dev/sys/fs/by-name/userdata/gc_reclaimed_segments
+
# Back to default VM settings
write /proc/sys/vm/dirty_expire_centisecs 3000
write /proc/sys/vm/dirty_background_ratio 10
diff --git a/manifest.xml b/manifest.xml
index e47d800..4f31669 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -203,15 +203,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>vendor.google.google_battery</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>IGoogleBattery</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>vendor.google.radioext</name>
<transport>hwbinder</transport>
<version>1.3</version>
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 23477f4..d78da5b 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -28,6 +28,7 @@
using android::hardware::google::pixel::SysfsCollector;
using android::hardware::google::pixel::UeventListener;
+#define BLOCK_STATS_LENGTH 11
#define UFSHC_PATH(filename) "/dev/sys/block/bootdevice/" #filename
const struct SysfsCollector::SysfsPaths sysfs_paths = {
.SlowioReadCntPath = UFSHC_PATH(slowio_read_cnt),
