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

Commit 532a608f authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge changes I7790dde8,I065907a5,Id2e82024 into main 

* changes:
  Add missing <assert.h> include
  Add missing <functional> and <vector> includes
  snapuserd_test: don't discard result of std::async
parents 59a2cde8 87c90e7b

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp

+6 −2
Original line number Diff line number Diff line
@@ -714,10 +714,12 @@ TEST_F(SnapuserdTest, Snapshot_MERGE_IO_TEST) { 
    }

    ASSERT_NO_FATAL_FAILURE(SetupDefault());

    // Issue I/O before merge begins

    auto read_future =

            std::async(std::launch::async, &SnapuserdTest::ReadSnapshotDeviceAndValidate, this);

    // Start the merge

    ASSERT_TRUE(Merge());

    ValidateMerge();

    read_future.wait();

}



TEST_F(SnapuserdTest, Snapshot_MERGE_IO_TEST_1) {
@@ -728,9 +730,11 @@ TEST_F(SnapuserdTest, Snapshot_MERGE_IO_TEST_1) { 
    // Start the merge

    ASSERT_TRUE(StartMerge());

    // Issue I/O in parallel when merge is in-progress

    auto read_future =

            std::async(std::launch::async, &SnapuserdTest::ReadSnapshotDeviceAndValidate, this);

    CheckMergeCompletion();

    ValidateMerge();

    read_future.wait();

}



TEST_F(SnapuserdTest, Snapshot_Merge_Resume) {

libutils/String16_fuzz.cpp

+2 −0
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#include <functional>

#include <iostream>

#include <vector>



#include "fuzzer/FuzzedDataProvider.h"

#include "utils/String16.h"

trusty/apploader/apploader.cpp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <BufferAllocator/BufferAllocator.h>

#include <android-base/logging.h>

#include <android-base/unique_fd.h>

#include <assert.h>

#include <fcntl.h>

#include <getopt.h>

#include <stdbool.h>