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

Commit 2e8f6f01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Fix_format] log:overlay paths indent error" into main am: 9bf81137 am: dd5ab0aa 

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



Change-Id: Ice642e487658732e4112705768a418a340f42d5e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc5bebfe dd5ab0aa

services/core/java/com/android/server/pm/Settings.java

+3 −3
Original line number Diff line number Diff line
@@ -5575,7 +5575,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                    }

                    if (!paths.getOverlayPaths().isEmpty()) {

                        pw.print(prefix);

                        pw.println("    ");

                        pw.print("    ");

                        pw.print(libOverlayPaths.getKey());

                        pw.println(" overlay paths:");

                        for (String path : paths.getOverlayPaths()) {
@@ -5586,7 +5586,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
                    }

                    if (!paths.getResourceDirs().isEmpty()) {

                        pw.print(prefix);

                        pw.println("      ");

                        pw.print("    ");

                        pw.print(libOverlayPaths.getKey());

                        pw.println(" legacy overlay paths:");

                        for (String path : paths.getResourceDirs()) {