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

Commit 8fb8f0b6 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Avoid log spam for the common "no user keys" case." into main am: 357d9ae6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2847245



Change-Id: I3be603c388ca01be7f97f26afee36913130bb89a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45193744 357d9ae6

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

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

                mFingerprints);





        try {

        try {

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

            if (userKeys.exists()) {

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

                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) {

        } catch (IOException e) {

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

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

        }

        }