diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 2eab1573..48d30a44 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -387,9 +387,8 @@ endif
BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist
# Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load
-BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140/fips140.ko
+BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140.ko
BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))
-KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA))
# Kernel modules that are listed in vendor_kernel_boot.modules.load
BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load))
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index c8533217..f4bc6eac 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -877,10 +877,12 @@ on property:ro.build.fingerprint=*
write /sys/module/debug_kinfo/parameters/build_info ${ro.build.fingerprint}
# Bluetooth
-on post-fs-data
+on early-boot
chown bluetooth system /sys/devices/platform/175b0000.serial/serial0/serial0-0/bluetooth/hci0/rfkill0/state
chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill0/state
chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill2/state
+
+on post-fs-data
chown bluetooth system /proc/bluetooth/sleep/btwake
chown bluetooth system /proc/bluetooth/sleep/lpm
chown bluetooth system /proc/bluetooth/sleep/btwrite
diff --git a/default-permissions.xml b/default-permissions.xml
index e9a65436..ecdbaf01 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -41,12 +41,15 @@
-->
+
+
+
+
-
@@ -76,6 +79,8 @@
+
+
com.google.hardware.pixel.display
- 10
+ 12
IDisplay
default
diff --git a/manifest_media.xml b/manifest_media.xml
index 38e56ba2..18588a69 100644
--- a/manifest_media.xml
+++ b/manifest_media.xml
@@ -1,20 +1,13 @@
-
- android.hardware.media.c2
- hwbinder
- 1.0
-
- IComponentStore
- default1
-
+
+
+ android.hardware.media.c2
+ 1
+ IComponentStore/default1
-
- android.hardware.media.c2
- hwbinder
- 1.2
-
- IComponentStore
- default
-
+
+ android.hardware.media.c2
+ 1
+ IComponentStore/default
diff --git a/manifest_media_aosp.xml b/manifest_media_aosp.xml
index 9a1a3dba..2d1888be 100644
--- a/manifest_media_aosp.xml
+++ b/manifest_media_aosp.xml
@@ -1,4 +1,5 @@
+
android.hardware.media.c2
hwbinder
@@ -8,4 +9,10 @@
default
+
+
+ android.hardware.media.c2
+ 1
+ IComponentStore/default
+
diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index 6846cbe3..736d043d 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -106,7 +106,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
@@ -217,7 +217,7 @@
-
+
@@ -233,7 +233,7 @@
-
+
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 187df342..48b07e61 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -19,7 +19,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index 0f7c377a..78345dc1 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -117,24 +117,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -145,7 +145,7 @@
-
+
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f594fc6d..d266ccd3 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -249,8 +249,8 @@
true
-
- true
+
+ 6291456
20971520
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 595befbe..270a70af 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -92,21 +92,23 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
"/sys/class/power_supply/maxfg/gmsr",
"/sys/class/power_supply/maxfg_base/gmsr",
},
+ .FGModelLoadingPath = {
+ "/sys/class/power_supply/maxfg/m5_model_state",
+ "/sys/class/power_supply/maxfg_base/m5_model_state"
+ },
+ .FGLogBufferPath = {
+ "/dev/logbuffer_maxfg_monitor",
+ "/dev/logbuffer_max77779fg_monitor",
+ "/dev/logbuffer_maxfg_base_monitor",
+ "/dev/logbuffer_maxfg_secondary_monitor"
+ },
.TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count"
};
const struct UeventListener::UeventPaths ueventPaths = {
.AudioUevent = "/devices/virtual/amcs/amcs",
.TypeCPartnerUevent = "PRODUCT_TYPE=",
- .FGLearningPath = {
- "/sys/class/power_supply/maxfg/fg_learning_events",
- "/sys/class/power_supply/maxfg_base/fg_learning_events"
- },
- .FwUpdatePath = "",
- .FGModelLoadingPath = {
- "/sys/class/power_supply/maxfg/m5_model_state",
- "/sys/class/power_supply/maxfg_base/m5_model_state"
- }
+ .FwUpdatePath = ""
};
int main() {
diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 609af179..6b24cb57 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -56,6 +56,7 @@ cc_binary {
"libbinder_ndk",
"libprotobuf-cpp-lite",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
"libpixelusb-aidl",
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index cff00bda..2c42b116 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -602,6 +602,11 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role
fp = fopen(filename.c_str(), "w");
if (fp != NULL) {
int ret = fputs(convertRoletoString(in_role).c_str(), fp);
+ if (ret == EAGAIN) {
+ ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS);
+ std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS));
+ ret = fputs(convertRoletoString(in_role).c_str(), fp);
+ }
fclose(fp);
if ((ret != EOF) && ReadFileToString(filename, &written)) {
written = Trim(written);
diff --git a/usb/usb/Usb.h b/usb/usb/Usb.h
index 779e7254..d6ed72e9 100644
--- a/usb/usb/Usb.h
+++ b/usb/usb/Usb.h
@@ -56,6 +56,8 @@ constexpr char kGadgetName[] = "11210000.dwc3";
#define VBUS_PATH NEW_UDC_PATH "dwc3_exynos_otg_b_sess"
#define USB_DATA_PATH NEW_UDC_PATH "usb_data_enabled"
+#define ROLE_SWAP_RETRY_MS 700
+
struct Usb : public BnUsb {
Usb();