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

Commit a50d7faf authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc am: 9968866e 

am: d987fe1d

Change-Id: Idd53009ad61bb4a0b573febdbedc5dc0eee8265f
parents bdaee896 d987fe1d

install.cpp

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ static const float DEFAULT_FILES_PROGRESS_FRACTION = 0.4; 
static const float DEFAULT_IMAGE_PROGRESS_FRACTION = 0.1;



// This function parses and returns the build.version.incremental

static int parse_build_number(std::string str) {

    size_t pos = str.find("=");

static int parse_build_number(const std::string& str) {

    size_t pos = str.find('=');

    if (pos != std::string::npos) {

        std::string num_string = android::base::Trim(str.substr(pos+1));

        int build_number;

tests/component/applypatch_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static bool file_cmp(std::string& f1, std::string& f2) { 
    return c1 == c2;

}



static std::string from_testdata_base(const std::string fname) {

static std::string from_testdata_base(const std::string& fname) {

    return android::base::StringPrintf("%s%s%s/%s",

            &DATA_PATH[0],

            &NATIVE_TEST_PATH[0],

wear_touch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void* WearSwipeDetector::touch_thread(void* cookie) { 
    return NULL;

}



#define test_bit(bit, array)    (array[bit/8] & (1<<(bit%8)))

#define test_bit(bit, array)    ((array)[(bit)/8] & (1<<((bit)%8)))



int WearSwipeDetector::openDevice(const char *device) {

    int fd = open(device, O_RDONLY);