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

Commit 45ef5f4b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7298338 from 801669f9 to sc-v2-release 

Change-Id: I9d8a609d540926c4519a92480da86e83e8adff59
parents 56b27cc5 801669f9

fs_mgr/tests/fs_mgr_test.cpp

+20 −20
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ source none2 swap defaults forcefdeorfbe= 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(3U, fstab.size());

    ASSERT_LE(3U, fstab.size());



    auto entry = fstab.begin();

    EXPECT_EQ("none0", entry->mount_point);
@@ -561,7 +561,7 @@ source none0 swap defaults encryptable=/dir/key 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(1U, fstab.size());

    ASSERT_LE(1U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};

    flags.crypt = true;
@@ -585,7 +585,7 @@ source none3 swap defaults voldmanaged=sdcard:auto 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(4U, fstab.size());

    ASSERT_LE(4U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};

    flags.vold_managed = true;
@@ -626,7 +626,7 @@ source none1 swap defaults length=123456 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(2U, fstab.size());

    ASSERT_LE(2U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};
@@ -652,7 +652,7 @@ source none1 swap defaults swapprio=123456 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(2U, fstab.size());

    ASSERT_LE(2U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};
@@ -682,7 +682,7 @@ source none5 swap defaults zramsize=% 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(6U, fstab.size());

    ASSERT_LE(6U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};
@@ -728,7 +728,7 @@ source none0 swap defaults forceencrypt=/dir/key 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(1U, fstab.size());

    ASSERT_LE(1U, fstab.size());



    auto entry = fstab.begin();

    EXPECT_EQ("none0", entry->mount_point);
@@ -751,7 +751,7 @@ source none0 swap defaults forcefdeorfbe=/dir/key 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(1U, fstab.size());

    ASSERT_LE(1U, fstab.size());



    auto entry = fstab.begin();

    EXPECT_EQ("none0", entry->mount_point);
@@ -775,7 +775,7 @@ source none0 swap defaults fileencryption=aes-256-xts:aes-256-cts:v 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(1U, fstab.size());

    ASSERT_LE(1U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};

    flags.file_encryption = true;
@@ -797,7 +797,7 @@ source none1 swap defaults max_comp_streams=123456 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(2U, fstab.size());

    ASSERT_LE(2U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};
@@ -825,7 +825,7 @@ source none3 swap defaults reservedsize=2m 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(4U, fstab.size());

    ASSERT_LE(4U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};
@@ -863,7 +863,7 @@ source none3 swap defaults eraseblk=8192 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(4U, fstab.size());

    ASSERT_LE(4U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};
@@ -901,7 +901,7 @@ source none3 swap defaults logicalblk=8192 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(4U, fstab.size());

    ASSERT_LE(4U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};
@@ -938,7 +938,7 @@ source none1 swap defaults avb_keys=/path/to/test.avbpubkey 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(2U, fstab.size());

    ASSERT_LE(2U, fstab.size());



    auto entry = fstab.begin();

    EXPECT_EQ("none0", entry->mount_point);
@@ -967,7 +967,7 @@ source none0 swap defaults keydirectory=/dir/key 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(1U, fstab.size());

    ASSERT_LE(1U, fstab.size());



    auto entry = fstab.begin();

    EXPECT_EQ("none0", entry->mount_point);
@@ -989,7 +989,7 @@ source none0 swap defaults keydirectory=/dir/key,metadata_encryptio 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(1U, fstab.size());

    ASSERT_LE(1U, fstab.size());



    auto entry = fstab.begin();

    EXPECT_EQ("adiantum", entry->metadata_encryption);
@@ -1006,7 +1006,7 @@ source none0 swap defaults keydirectory=/dir/key,metadata_encryptio 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(1U, fstab.size());

    ASSERT_LE(1U, fstab.size());



    auto entry = fstab.begin();

    EXPECT_EQ("aes-256-xts:wrappedkey_v0", entry->metadata_encryption);
@@ -1027,7 +1027,7 @@ source none0 swap defaults sysfs_path=/sys/device 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(1U, fstab.size());

    ASSERT_LE(1U, fstab.size());



    auto entry = fstab.begin();

    EXPECT_EQ("none0", entry->mount_point);
@@ -1053,7 +1053,7 @@ source none4 swap defaults zram_backingdev_size=2m 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(4U, fstab.size());

    ASSERT_LE(4U, fstab.size());



    auto entry = fstab.begin();
@@ -1114,7 +1114,7 @@ source none6 swap defaults readahead_size_kb=0 


    Fstab fstab;

    EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));

    ASSERT_EQ(7U, fstab.size());

    ASSERT_LE(7U, fstab.size());



    FstabEntry::FsMgrFlags flags = {};

libstats/pull_rust/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ rust_bindgen { 
    source_stem: "bindings",

    bindgen_flags: [

        "--size_t-is-usize",

        "--whitelist-function=AStatsEventList_addStatsEvent",

        "--whitelist-function=AStatsEvent_.*",

        "--whitelist-function=AStatsManager_.*",

        "--whitelist-var=AStatsManager_.*",

        "--allowlist-function=AStatsEventList_addStatsEvent",

        "--allowlist-function=AStatsEvent_.*",

        "--allowlist-function=AStatsManager_.*",

        "--allowlist-var=AStatsManager_.*",

    ],

    target: {

        android: {

rootdir/init-debug.rc

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ on property:persist.mmc.max_write_speed=* 
on property:persist.mmc.cache_size=*

    write /sys/block/mmcblk0/cache_size ${persist.mmc.cache_size}



on early-init && property:ro.product.enforce_debugfs_restrictions=true

on early-init && property:ro.product.debugfs_restrictions.enabled=true

    mount debugfs debugfs /sys/kernel/debug

    chmod 0755 /sys/kernel/debug



on property:sys.boot_completed=1 && property:ro.product.enforce_debugfs_restrictions=true

on property:sys.boot_completed=1 && property:ro.product.debugfs_restrictions.enabled=true

   umount /sys/kernel/debug