Merge "Fixing crash when dumping secondary SystemUI user service." into nyc-dev (5d65340f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/SystemUISecondaryUserService.java

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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 {
	}		}
	}		}
	}		}
			}