Merge Android 13 QPR1
Bug: 261731544
Merged-In: I5b7c5038e18c1364cb04b6933655e444c6b9033c
Change-Id: I4669692b32cef445b06738db6708482dc6beb3a0
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ed28809..45ae60b 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -46,6 +46,7 @@
BOARD_KERNEL_CMDLINE += androidboot.usbcontroller=a600000.dwc3 swiotlb=2048
BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/1d84000.ufshc
BOARD_KERNEL_CMDLINE += loop.max_part=7
+BOARD_KERNEL_CMDLINE += cgroup_disable=pressure
BOARD_KERNEL_BASE := 0x00000000
BOARD_KERNEL_PAGESIZE := 4096
diff --git a/coral/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml b/coral/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
index d1550a0..7cee0e6 100644
--- a/coral/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
+++ b/coral/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
@@ -12,13 +12,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="8dp"
- android:height="8dp"
- android:viewportWidth="21"
- android:viewportHeight="21">
+ android:width="226px"
+ android:height="226px"
+ android:viewportWidth="226.0"
+ android:viewportHeight="226.0">
<path
android:fillColor="#000000"
- android:pathData="M0,0L25,0C22.74,0 21.99,0 21.31,0C19.94,0.01 18.83,0.04 17.73,0.11C16.91,0.17 16.09,0.25 15.3,0.36C14.5,0.48 13.72,0.62 12.95,0.81C11.42,1.19 9.97,1.72 8.65,2.43C7.32,3.14 6.12,4.02 5.08,5.07C4.04,6.11 3.15,7.31 2.44,8.64C1.73,9.97 1.19,11.42 0.82,12.94C0.63,13.7 0.48,14.49 0.37,15.29C0.25,16.09 0.17,16.9 0.12,17.72C0.05,18.82 0.02,19.93 0.01,21.55C0.01,22.36 0.01,23.3 0.01,25.56L0,0Z" />
+ android:pathData="m 0,0 h 226 c 0,0 -52.27192,1.0726108 -61.23,1.1719867 -8.95806,0.099376 -21.1853,0.2041158 -30.15844,0.7514371 -8.97314,0.5473213 -12.69853,1.0467407 -19.42891,2.0830807 C 108.45226,5.0428448 102.2913,6.3340499 94.933458,8.677661 87.575619,11.021272 81.490894,13.052137 71.300726,18.392016 61.110557,23.731896 49.309178,31.589928 41.310844,39.449342 33.31251,47.308756 25.812243,56.991282 20.03697,67.20707 14.261697,77.422858 10.399991,88.852909 7.0517259,100.1815 c -1.809715,6.12301 -2.6301304,11.62553 -3.5037396,17.74012 -0.00371,0.0259 -0.00815,0.0517 -0.011098,0.0777 -0.6735214,5.94798 -0.9536095,8.53719 -1.5016437,17.89509 -0.5480342,9.3579 -1.10418729,27.421 -1.27377139,38.26441 L 0,226 Z" />
</vector>
-
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 80fb1d7..5e5b0ba 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -80,9 +80,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/flame/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml b/flame/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
index a2f0e11..1709f50 100644
--- a/flame/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
+++ b/flame/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
@@ -12,13 +12,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="8dp"
- android:height="8dp"
- android:viewportWidth="21"
- android:viewportHeight="21">
+ android:width="176px"
+ android:height="176px"
+ android:viewportWidth="176.0"
+ android:viewportHeight="176.0">
<path
android:fillColor="#000000"
- android:pathData="M0,0L25,0C22.74,0 21.99,0 21.31,0C19.94,0.01 18.83,0.04 17.73,0.11C16.91,0.17 16.09,0.25 15.3,0.36C14.5,0.48 13.72,0.62 12.95,0.81C11.42,1.19 9.97,1.72 8.65,2.43C7.32,3.14 6.12,4.02 5.08,5.07C4.04,6.11 3.15,7.31 2.44,8.64C1.73,9.97 1.19,11.42 0.82,12.94C0.63,13.7 0.48,14.49 0.37,15.29C0.25,16.09 0.17,16.9 0.12,17.72C0.05,18.82 0.02,19.93 0.01,21.55C0.01,22.36 0.01,23.3 0.01,25.56L0,0Z"/>
+ android:pathData="M 0,0 h 176 c 0,0 -41.80985,1.1811025 -47.30898,1.4679924 -5.49913,0.2868899 -11.03264,0.529424 -14.80238,0.7907218 C 110.1189,2.520012 105.56609,2.9305126 100.31472,3.5044417 95.71113,4.0075741 91.783454,4.7255034 86.292893,5.795495 80.802331,6.8654867 76.860386,7.8252084 70.93934,9.8838835 65.018294,11.942558 56.74931,15.819731 52.25,18.416053 c -4.49931,2.596322 -5.891653,3.789325 -8.943718,6.107722 -3.052065,2.318397 -6.42853,5.085773 -9.150032,7.851225 -1.36219,1.384188 -4.312937,4.354097 -6.769293,7.233011 -2.451166,2.872831 -4.81174,6.253015 -6.64335,8.970257 C 15.521332,56.325652 12.242354,64.091419 10.418362,69.161754 8.5943696,74.232089 7.5119098,78.803782 6.371114,83.32052 5.2303182,87.837258 4.2150777,93.315427 3.5030057,98.449319 2.7909337,103.58321 2.5888564,109.52729 2.1691942,114.78662 1.7459101,120.09134 1.6016524,128.15059 1.2565168,135.11916 0.77900803,144.76045 0,176 0,176 Z" />
</vector>
-
diff --git a/init.hardware.rc b/init.hardware.rc
index 474d289..00feb64 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -516,6 +516,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
+
# Runtime fs tuning
write /sys/block/sda/queue/nr_requests 128
write /sys/block/sda/queue/iostats 1
diff --git a/manifest.xml b/manifest.xml
index 823da5c..f92d63b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -161,15 +161,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 b327477..6218eeb 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 MAXIM_DIR(filename) "/sys/class/power_supply/maxfg/" #filename
#define UFSHC_PATH(filename) "/dev/sys/block/bootdevice/" #filename
#define UFSHC_HEALTH_PATH(filename) "/dev/sys/block/bootdevice/health/" #filename
