Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13f702ff authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13017112 from f70922f2 to 25Q2-release 

Change-Id: I08febc845c85017b66f3212bc287f3b9b8826eb0
parents 25eb6f96 f70922f2

bootstat/OWNERS

+2 −0
Original line number Diff line number Diff line 
dvander@google.com

achant@google.com

markcheng@google.com

bootstat/bootstat.cpp

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ const std::map<std::string, int32_t> kBootReasonMap = { 
    {"reboot,longkey,master_dc", 235},

    {"reboot,ocp2,pmic,if", 236},

    {"reboot,ocp,pmic,if", 237},

    {"reboot,fship", 238},

    {"reboot,fship.*", 238},

    {"reboot,ocp,.*", 239},

    {"reboot,ntc,pmic,sub", 240},

};

fs_mgr/libsnapshot/scratch_super.cpp

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ std::string MapScratchOtaMetadataPartition(const std::string& scratch_device) { 
}



// Entry point to create a scratch device on super partition

// This will create a 1MB space in super. The space will be

// This will create a 2MB space in super. The space will be

// from the current active slot. Ext4 filesystem will be created

// on this scratch device and all the OTA related directories

// will be created.

fs_mgr/libsnapshot/scratch_super.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ namespace snapshot { 
constexpr char kMkExt4[] = "/system/bin/mke2fs";

constexpr char kOtaMetadataFileContext[] = "u:object_r:ota_metadata_file:s0";

constexpr char kOtaMetadataMount[] = "/mnt/scratch_ota_metadata_super";

const size_t kOtaMetadataPartitionSize = uint64_t(1 * 1024 * 1024);

const size_t kOtaMetadataPartitionSize = uint64_t(2 * 1024 * 1024);

constexpr char kPhysicalDevice[] = "/dev/block/by-name/";



bool IsScratchOtaMetadataOnSuper();

fs_mgr/tests/adb-remount-test.sh

+8 −0
Original line number Diff line number Diff line
@@ -1360,6 +1360,14 @@ cat "${system_build_prop_original}" - <<EOF >"${system_build_prop_modified}" 
# Properties added by adb remount test

test.adb.remount.system.build.prop=true

EOF



# Move /system/build.prop to make sure we can move and then replace files

# Note that as of kernel 6.1 mv creates the char_file that whites out the lower

# file with different selabels than rm does

# See b/394290609

adb shell mv /system/build.prop /system/build.prop.backup >/dev/null ||

  die "adb shell rm /system/build.prop"



adb push "${system_build_prop_modified}" /system/build.prop >/dev/null ||

  die "adb push /system/build.prop"

adb pull /system/build.prop "${system_build_prop_fromdevice}" >/dev/null ||