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

Commit 2ef666c1 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Handle user current arg in OverlayManager dump" into main

parents 9906a5bf 3d82b309

core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,9 @@ public class InstallOverlayTests extends BaseHostJUnit4Test { 
                shell("cmd overlay list " + APP_OVERLAY_PACKAGE_NAME).trim());

        assertEquals("STATE_ENABLED",

                shell("cmd overlay dump state " + APP_OVERLAY_PACKAGE_NAME).trim());



        assertEquals("STATE_ENABLED",

                shell("cmd overlay dump --user current state " + APP_OVERLAY_PACKAGE_NAME).trim());

    }



    private void delay() {

services/core/java/com/android/server/om/OverlayManagerService.java

+5 −3
Original line number Diff line number Diff line
@@ -1064,10 +1064,12 @@ public final class OverlayManagerService extends SystemService { 
                        return;

                    }

                    try {

                        dumpState.setUserId(Integer.parseInt(args[opti]));

                        final int userId = UserHandle.parseUserArg(args[opti]);

                        final int realUserId = handleIncomingUser(userId, "dump");

                        dumpState.setUserId(realUserId);

                        opti++;

                    } catch (NumberFormatException e) {

                        pw.println("Error: user argument is not a number: " + args[opti]);

                    } catch (Exception e) {

                        pw.println("Error: " + e.getMessage());

                        return;

                    }

                } else if ("--verbose".equals(opt)) {