Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dump all users when dumpsys overlay is invoked" into qt-qpr1-dev

Browse Source 
am: e36d59ea71

Change-Id: I357b99126cfa4eac585e87e72d46941270381be8
This commit is contained in:
Nicholas Sauer
2019-09-11 13:41:19 -07:00
committed by android-build-merger
parent 32248f52c9 e36d59ea71
commit a3b9c46f01
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/om/OverlayManagerService.java
View File

@@ -751,7 +751,7 @@ public final class OverlayManagerService extends SystemService {
@Override @Override
protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
final DumpState dumpState = new DumpState(); final DumpState dumpState = new DumpState();
dumpState.setUserId(UserHandle.getUserId(Binder.getCallingUid())); dumpState.setUserId(UserHandle.USER_ALL);
int opti = 0; int opti = 0;
while (opti < args.length) { 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."); pw.println(" so the following are equivalent: mState, mstate, State, state.");
return; return;
} else if ("--user".equals(opt)) { } else if ("--user".equals(opt)) {
opti++;
if (opti >= args.length) { if (opti >= args.length) {
pw.println("Error: user missing argument"); pw.println("Error: user missing argument");
return; return;
} }
try { try {
dumpState.setUserId(Integer.parseInt(args[opti])); dumpState.setUserId(Integer.parseInt(args[opti]));
opti++;
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
pw.println("Error: user argument is not a number: " + args[opti]); pw.println("Error: user argument is not a number: " + args[opti]);
return; return;