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

Commit 357d9ae6 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Avoid log spam for the common "no user keys" case." into main

parents b932bbb9 a52fcec3

services/core/java/com/android/server/adb/AdbDebuggingManager.java

+7 −2
Original line number Diff line number Diff line
@@ -1797,8 +1797,13 @@ public class AdbDebuggingManager { 
                mFingerprints);



        try {

            File userKeys = new File("/data/misc/adb/adb_keys");

            if (userKeys.exists()) {

                dump.write("user_keys", AdbDebuggingManagerProto.USER_KEYS,

                    FileUtils.readTextFile(new File("/data/misc/adb/adb_keys"), 0, null));

                           FileUtils.readTextFile(userKeys, 0, null));

            } else {

                Slog.i(TAG, "No user keys on this device");

            }

        } catch (IOException e) {

            Slog.i(TAG, "Cannot read user keys", e);

        }