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 
am: 5d65340fc5

* commit '5d65340fc5b5a0becd204b3feb9627b2de33fceb':
  Fixing crash when dumping secondary SystemUI user service.

Change-Id: I6fc0594335291a07e7dae79cc8c80b0b3d952acc
This commit is contained in:
Winson
2016-04-20 00:26:26 +00:00
committed by android-build-merger
parent 6ee7417cd7 5d65340fc5
commit cb6674ef06
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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