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

Commit 177d3ceb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make it easier to match SurfaceControl names when debugging" into main

parents 4dea8316 38f60ace

core/java/android/view/SurfaceControlRegistry.java

+6 −4
Original line number Diff line number Diff line
@@ -342,12 +342,14 @@ public class SurfaceControlRegistry { 
            return false;

        }

        final boolean matchName = !sCallStackDebuggingMatchName.isEmpty();

        if (matchName && (name == null

                || !sCallStackDebuggingMatchName.contains(name.toLowerCase()))) {

            // Skip if target surface doesn't match requested surface

        if (!matchName) {

            return true;

        }

        if (name == null) {

            return false;

        }

        return true;

        return sCallStackDebuggingMatchName.contains(name.toLowerCase()) ||

                        name.toLowerCase().contains(sCallStackDebuggingMatchName);

    }



    /**