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

Commit 9fc59d2d authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Fix dump() without ACCESS_KEYGUARD_SECURE_STORAGE" into udc-dev am:... 

Merge "Fix dump() without ACCESS_KEYGUARD_SECURE_STORAGE" into udc-dev am: ebe8627e am: 1dfa51bf

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



Change-Id: Ife7d0510a02e796942ff4f28dfeeea331e1cdbe8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29c4d9c4 1dfa51bf

services/core/java/com/android/server/locksettings/LockSettingsService.java

+10 −0
Original line number Diff line number Diff line
@@ -3088,6 +3088,16 @@ public class LockSettingsService extends ILockSettings.Stub { 
    @Override

    protected void dump(FileDescriptor fd, PrintWriter printWriter, String[] args) {

        if (!DumpUtils.checkDumpPermission(mContext, TAG, printWriter)) return;



        final long identity = Binder.clearCallingIdentity();

        try {

            dumpInternal(printWriter);

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    private void dumpInternal(PrintWriter printWriter) {

        IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, "  ");



        pw.println("Current lock settings service state:");