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

Commit 629686cd authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Move adb_keys to product partition" into main am: cdca5ed7 am: babe7816 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3244206



Change-Id: I6d9cbfa24a9d92f7dc2d78be2bb5ae3ebb7d1fec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ced538a babe7816

libs/adbd_auth/adbd_auth.cpp

+6 −3
Original line number Diff line number Diff line
@@ -390,13 +390,16 @@ public: 
        }

    }



    static constexpr const char* key_paths[] = {"/adb_keys", "/data/misc/adb/adb_keys"};

    static constexpr std::pair<const char*, bool> key_paths[] = {

        {"/adb_keys",               true  /* follow symlinks */       },

        {"/data/misc/adb/adb_keys", false /* don't follow symlinks */ },

    };

    void IteratePublicKeys(bool (*callback)(void*, const char*, size_t), void* opaque) {

        for (const auto& path : key_paths) {

        for (const auto& [path, follow_symlinks] : key_paths) {

            if (access(path, R_OK) == 0) {

                LOG(INFO) << "adbd_auth: loading keys from " << path;

                std::string content;

                if (!android::base::ReadFileToString(path, &content)) {

                if (!android::base::ReadFileToString(path, &content, follow_symlinks)) {

                    PLOG(ERROR) << "adbd_auth: couldn't read " << path;

                    continue;

                }