Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 8700596 from ef2dde8a75 to udc-release

Browse source 
Change-Id: Ifef5daea86abb05c9e263523d7edc2ce2256a994
This commit is contained in:
Android Build Coastguard Worker 2022-06-09 03:03:04 +00:00
commit c42d97a7c2
5 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BoardConfig-common.mk
View file

@ -46,7 +46,6 @@ endif
BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\" BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += swiotlb=noforce
BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs

4
device_framework_matrix_product.xml
View file

@ -134,9 +134,9 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="hidl" optional="true"> <hal format="aidl" optional="true">
<name>vendor.google.google_battery</name> <name>vendor.google.google_battery</name>
<version>1.2</version> <version>1</version>
<interface> <interface>
<name>IGoogleBattery</name> <name>IGoogleBattery</name>
<instance>default</instance> <instance>default</instance>

19
interfaces/boot/1.2/BootControl.cpp
View file

@ -49,6 +49,8 @@ namespace {
#define BOOT_B_PATH "/dev/block/by-name/boot_b" #define BOOT_B_PATH "/dev/block/by-name/boot_b"
#define DEVINFO_PATH "/dev/block/by-name/devinfo" #define DEVINFO_PATH "/dev/block/by-name/devinfo"
#define BLOW_AR_PATH "/sys/kernel/boot_control/blow_ar"
// slot flags // slot flags
#define AB_ATTR_PRIORITY_SHIFT 52 #define AB_ATTR_PRIORITY_SHIFT 52
#define AB_ATTR_PRIORITY_MASK (3UL << AB_ATTR_PRIORITY_SHIFT) #define AB_ATTR_PRIORITY_MASK (3UL << AB_ATTR_PRIORITY_SHIFT)
@ -174,6 +176,11 @@ static void DevInfoInitSlot(devinfo_ab_slot_data_t &slot_data) {
slot_data.fastboot_ok = 0; slot_data.fastboot_ok = 0;
} }
static bool blowAR() {
android::base::unique_fd fd(open(BLOW_AR_PATH, O_WRONLY | O_DSYNC));
return android::base::WriteStringToFd("1", fd);
}
} // namespace } // namespace
// Methods from ::android::hardware::boot::V1_0::IBootControl follow. // Methods from ::android::hardware::boot::V1_0::IBootControl follow.
@ -211,7 +218,17 @@ Return<void> BootControl::markBootSuccessful(markBootSuccessful_cb _hidl_cb) {
ret = setSlotFlag(getCurrentSlot(), AB_ATTR_SUCCESSFUL); ret = setSlotFlag(getCurrentSlot(), AB_ATTR_SUCCESSFUL);
} }
!ret ? _hidl_cb({false, "Failed to set successful flag"}) : _hidl_cb({true, ""}); if (!ret) {
_hidl_cb({false, "Failed to set successful flag"});
return Void();
}
if (!blowAR()) {
ALOGE("Failed to blow anti-rollback counter");
// Ignore the error, since ABL will re-trigger it on reboot
}
_hidl_cb({true, ""});
return Void(); return Void();
} }

15
manifest.xml
View file

@ -133,14 +133,13 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="hidl"> <hal format="aidl">
<name>vendor.google.google_battery</name> <name>vendor.google.google_battery</name>
<transport>hwbinder</transport> <version>1</version>
<version>1.2</version> <interface>
<interface> <name>IGoogleBattery</name>
<name>IGoogleBattery</name> <instance>default</instance>
<instance>default</instance> </interface>
</interface>
</hal> </hal>
<hal format="hidl"> <hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name> <name>vendor.google.whitechapel.audio.audioext</name>

15
manifest_64.xml
View file

@ -125,14 +125,13 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="hidl"> <hal format="aidl">
<name>vendor.google.google_battery</name> <name>vendor.google.google_battery</name>
<transport>hwbinder</transport> <version>1</version>
<version>1.2</version> <interface>
<interface> <name>IGoogleBattery</name>
<name>IGoogleBattery</name> <instance>default</instance>
<instance>default</instance> </interface>
</interface>
</hal> </hal>
<hal format="hidl"> <hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name> <name>vendor.google.whitechapel.audio.audioext</name>