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

Commit 8cdcd60e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10889587 from a3cfd67b to 24Q1-release 

Change-Id: I9b27c08a373eac973a616dcbecb63c2cfcbf7a05
parents 83727260 a3cfd67b

fs_mgr/libfs_avb/tests/avb_util_test.cpp

+8 −3
Original line number Original line Diff line number Diff line
@@ -655,10 +655,12 @@ TEST_F(AvbUtilTest, VerifyVBMetaDataWithoutFooter) { 
            "      Partition Name:          boot\n"

            "      Partition Name:          boot\n"

            "      Rollback Index Location: 1\n"

            "      Rollback Index Location: 1\n"

            "      Public key (sha1):       cdbb77177f731920bbe0a0f94f84d9038ae0617d\n"

            "      Public key (sha1):       cdbb77177f731920bbe0a0f94f84d9038ae0617d\n"

            "      Flags:                   0\n"

            "    Chain Partition descriptor:\n"

            "    Chain Partition descriptor:\n"

            "      Partition Name:          system\n"

            "      Partition Name:          system\n"

            "      Rollback Index Location: 2\n"

            "      Rollback Index Location: 2\n"

            "      Public key (sha1):       2597c218aae470a130f61162feaae70afd97f011\n",

            "      Public key (sha1):       2597c218aae470a130f61162feaae70afd97f011\n"

            "      Flags:                   0\n",

            InfoImage("vbmeta.img"));

            InfoImage("vbmeta.img"));





    android::base::unique_fd fd(open(vbmeta_path.value().c_str(), O_RDONLY | O_CLOEXEC));

    android::base::unique_fd fd(open(vbmeta_path.value().c_str(), O_RDONLY | O_CLOEXEC));
@@ -876,10 +878,12 @@ TEST_F(AvbUtilTest, GetChainPartitionInfo) { 
            "      Partition Name:          boot\n"

            "      Partition Name:          boot\n"

            "      Rollback Index Location: 1\n"

            "      Rollback Index Location: 1\n"

            "      Public key (sha1):       cdbb77177f731920bbe0a0f94f84d9038ae0617d\n"

            "      Public key (sha1):       cdbb77177f731920bbe0a0f94f84d9038ae0617d\n"

            "      Flags:                   0\n"

            "    Chain Partition descriptor:\n"

            "    Chain Partition descriptor:\n"

            "      Partition Name:          vbmeta_system\n"

            "      Partition Name:          vbmeta_system\n"

            "      Rollback Index Location: 2\n"

            "      Rollback Index Location: 2\n"

            "      Public key (sha1):       2597c218aae470a130f61162feaae70afd97f011\n",

            "      Public key (sha1):       2597c218aae470a130f61162feaae70afd97f011\n"

            "      Flags:                   0\n",

            InfoImage("vbmeta.img"));

            InfoImage("vbmeta.img"));





    bool fatal_error = false;

    bool fatal_error = false;
@@ -909,7 +913,8 @@ TEST_F(AvbUtilTest, GetChainPartitionInfo) { 
            "    Chain Partition descriptor:\n"

            "    Chain Partition descriptor:\n"

            "      Partition Name:          system\n"

            "      Partition Name:          system\n"

            "      Rollback Index Location: 3\n"

            "      Rollback Index Location: 3\n"

            "      Public key (sha1):       2597c218aae470a130f61162feaae70afd97f011\n",

            "      Public key (sha1):       2597c218aae470a130f61162feaae70afd97f011\n"

            "      Flags:                   0\n",

            InfoImage("vbmeta_system.img"));

            InfoImage("vbmeta_system.img"));





    chained_descriptors = GetChainPartitionInfo(LoadVBMetaData("vbmeta_system.img"), &fatal_error);

    chained_descriptors = GetChainPartitionInfo(LoadVBMetaData("vbmeta_system.img"), &fatal_error);

fs_mgr/libfs_avb/tests/basic_test.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -268,10 +268,12 @@ TEST_F(BaseFsAvbTest, GenerateVBMetaImageWithChainDescriptors) { 
            "      Partition Name:          boot\n"

            "      Partition Name:          boot\n"

            "      Rollback Index Location: 1\n"

            "      Rollback Index Location: 1\n"

            "      Public key (sha1):       cdbb77177f731920bbe0a0f94f84d9038ae0617d\n"

            "      Public key (sha1):       cdbb77177f731920bbe0a0f94f84d9038ae0617d\n"

            "      Flags:                   0\n"

            "    Chain Partition descriptor:\n"

            "    Chain Partition descriptor:\n"

            "      Partition Name:          system\n"

            "      Partition Name:          system\n"

            "      Rollback Index Location: 2\n"

            "      Rollback Index Location: 2\n"

            "      Public key (sha1):       2597c218aae470a130f61162feaae70afd97f011\n",

            "      Public key (sha1):       2597c218aae470a130f61162feaae70afd97f011\n"

            "      Flags:                   0\n",

            InfoImage("vbmeta.img"));

            InfoImage("vbmeta.img"));

}

}