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

Commit d095e073 authored by Greg Kaiser's avatar Greg Kaiser Committed by android-build-merger
Browse files

Merge changes Ia84ed9ec,I1c0fde72 am: 10533c57 

am: b6bc0075

Change-Id: I4371bb9df7da381a7b8630a3b1c6a6afefbc5e73
parents 36eb8007 b6bc0075

adb/adb_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ std::string adb_get_android_dir_path() { 
    std::string android_dir = user_dir + OS_PATH_SEPARATOR + ".android";

    struct stat buf;

    if (stat(android_dir.c_str(), &buf) == -1) {

        if (adb_mkdir(android_dir.c_str(), 0750) == -1) {

        if (adb_mkdir(android_dir, 0750) == -1) {

            PLOG(FATAL) << "Cannot mkdir '" << android_dir << "'";

        }

    }

adb/bugreport_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ class BugreportTest : public ::testing::Test { 


    void ExpectBugreportzVersion(const std::string& version) {

        EXPECT_CALL(br_, SendShellCommand("bugreportz -v", false, _))

            .WillOnce(DoAll(WithArg<2>(WriteOnStderr(version.c_str())),

            .WillOnce(DoAll(WithArg<2>(WriteOnStderr(version)),

                            WithArg<2>(ReturnCallbackDone(0))));

    }

adb/client/auth.cpp

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ void adb_auth_init() { 
#endif



    for (const std::string& path : key_paths) {

        load_keys(path.c_str());

        load_keys(path);

    }

}

adb/client/file_sync_client.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ bool do_sync_push(const std::vector<const char*>& srcs, const char* dst, bool sy 
                dst_dir.append(android::base::Basename(src_path));

            }



            success &= copy_local_dir_remote(sc, src_path, dst_dir.c_str(), sync, false);

            success &= copy_local_dir_remote(sc, src_path, dst_dir, sync, false);

            continue;

        } else if (!should_push_file(st.st_mode)) {

            sc.Warning("skipping special file '%s' (mode = 0o%o)", src_path, st.st_mode);
@@ -1128,7 +1128,7 @@ static bool copy_remote_dir_local(SyncConnection& sc, std::string rpath, 
    // Recursively build the list of files to copy.

    sc.Printf("pull: building file list...");

    std::vector<copyinfo> file_list;

    if (!remote_build_list(sc, &file_list, rpath.c_str(), lpath.c_str())) {

    if (!remote_build_list(sc, &file_list, rpath, lpath)) {

        return false;

    }
@@ -1240,7 +1240,7 @@ bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst, 
                dst_dir.append(android::base::Basename(src_path));

            }



            success &= copy_remote_dir_local(sc, src_path, dst_dir.c_str(), copy_attrs);

            success &= copy_remote_dir_local(sc, src_path, dst_dir, copy_attrs);

            continue;

        } else if (!should_pull_file(src_st.st_mode)) {

            sc.Warning("skipping special file '%s' (mode = 0o%o)", src_path, src_st.st_mode);

adb/daemon/file_sync_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static bool do_send(int s, const std::string& spec, std::vector<char>& buffer) { 
    bool result;

    uint32_t timestamp;

    if (S_ISLNK(mode)) {

        result = handle_send_link(s, path.c_str(), &timestamp, buffer);

        result = handle_send_link(s, path, &timestamp, buffer);

    } else {

        // Copy user permission bits to "group" and "other" permissions.

        mode &= 0777;