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

Merge "Fixing crash when dumping secondary SystemUI user service." into nyc-dev

Browse Source
This commit is contained in:
Winson Chung
2016-04-20 00:21:38 +00:00
committed by Android (Google) Code Review
parent 771fbfef27 5b15f9bb9d
commit 5d65340fc5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/SystemUISecondaryUserService.java
View File

@@ -16,11 +16,9 @@
package com.android.systemui; package com.android.systemui;
import android.app.ActivityManager;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.IBinder; import android.os.IBinder;
import android.os.Process;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
@@ -43,12 +41,15 @@ public class SystemUISecondaryUserService extends Service {
SystemUI[] services = ((SystemUIApplication) getApplication()).getServices(); SystemUI[] services = ((SystemUIApplication) getApplication()).getServices();
if (args == null || args.length == 0) { if (args == null || args.length == 0) {
for (SystemUI ui: services) { for (SystemUI ui: services) {
if (ui != null) {
pw.println("dumping service: " + ui.getClass().getName()); pw.println("dumping service: " + ui.getClass().getName());
ui.dump(fd, pw, args); ui.dump(fd, pw, args);
} }
}
} else { } else {
String svc = args[0]; String svc = args[0];
for (SystemUI ui: services) { for (SystemUI ui: services) {
if (ui != null) {
String name = ui.getClass().getName(); String name = ui.getClass().getName();
if (name.endsWith(svc)) { if (name.endsWith(svc)) {
ui.dump(fd, pw, args); ui.dump(fd, pw, args);
@@ -57,4 +58,5 @@ public class SystemUISecondaryUserService extends Service {
} }
} }
} }
}