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

Commit 5c4058ef authored by Greg Kaiser's avatar Greg Kaiser
Browse files

Reduce severity of logging statement 

It's often not an issue, much less a major or severe issue, to
not have some of the adb keys on a device.  So we reduce the
severity of the logging in this case.

We especially care about this instance because dump() is invoked
when generating a bugreport, when folks are likely to be looking
through for Errors.  Giving an Error for this non-Error situation
can confuse triage of other issues.

Test: Bug report on device lacking user adb keys no longer has an Error about it
Bug: 174797634
Change-Id: Ib17efc2e7c61ff5e0bbe00a37b812fd198c2b5fa
parent ece62140

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

+3 −3
Original line number Diff line number Diff line
@@ -1754,21 +1754,21 @@ public class AdbDebuggingManager { 
            dump.write("user_keys", AdbDebuggingManagerProto.USER_KEYS,

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

        } catch (IOException e) {

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

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

        }



        try {

            dump.write("system_keys", AdbDebuggingManagerProto.SYSTEM_KEYS,

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

        } catch (IOException e) {

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

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

        }



        try {

            dump.write("keystore", AdbDebuggingManagerProto.KEYSTORE,

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

        } catch (IOException e) {

            Slog.e(TAG, "Cannot read keystore: ", e);

            Slog.i(TAG, "Cannot read keystore: ", e);

        }



        dump.end(token);