From b7ef06ac376d0977514d7f182c5a5935ec92925d Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Wed, 17 Jul 2019 17:16:23 -0700 Subject: [PATCH] Dump all users when `dumpsys overlay` is invoked Currently bugreports are missing OMS settings for non-system users. This change dumps overlay information for all users when the --user flag is not provided and it fixes the --user flag not parsing the specified id correctly. Bug: 137796495 Bug: 136549878 Test: manual Change-Id: I0d545253179b3545307b88b3151d11fd9e6cbd5b --- .../java/com/android/server/om/OverlayManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java index da69986cd59f8..965ddc9f27824 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -751,7 +751,7 @@ public final class OverlayManagerService extends SystemService { @Override protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { final DumpState dumpState = new DumpState(); - dumpState.setUserId(UserHandle.getUserId(Binder.getCallingUid())); + dumpState.setUserId(UserHandle.USER_ALL); int opti = 0; while (opti < args.length) { @@ -771,13 +771,13 @@ public final class OverlayManagerService extends SystemService { pw.println(" so the following are equivalent: mState, mstate, State, state."); return; } else if ("--user".equals(opt)) { - opti++; if (opti >= args.length) { pw.println("Error: user missing argument"); return; } try { dumpState.setUserId(Integer.parseInt(args[opti])); + opti++; } catch (NumberFormatException e) { pw.println("Error: user argument is not a number: " + args[opti]); return;