am 47e4aa80: am 089de88f: StatusBarService -> StatusBarManagerService (61b01018) · Commits · e / os / android_frameworks_base

services/java/com/android/server/InputMethodManagerService.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,7 @@ import com.android.internal.view.IInputMethodSession;
	import com.android.internal.view.InputBindResult;		import com.android.internal.view.InputBindResult;

	import com.android.server.status.IconData;		import com.android.server.status.IconData;
	import com.android.server.status.StatusBarService;		import com.android.server.status.StatusBarManagerService;

	import org.xmlpull.v1.XmlPullParserException;		import org.xmlpull.v1.XmlPullParserException;

	@@ -110,7 +110,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	final Context mContext;		final Context mContext;
	final Handler mHandler;		final Handler mHandler;
	final SettingsObserver mSettingsObserver;		final SettingsObserver mSettingsObserver;
	final StatusBarService mStatusBar;		final StatusBarManagerService mStatusBar;
	final IBinder mInputMethodIcon;		final IBinder mInputMethodIcon;
	final IconData mInputMethodData;		final IconData mInputMethodData;
	final IWindowManager mIWindowManager;		final IWindowManager mIWindowManager;
	@@ -447,7 +447,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	}		}
	}		}

	public InputMethodManagerService(Context context, StatusBarService statusBar) {		public InputMethodManagerService(Context context, StatusBarManagerService statusBar) {
	mContext = context;		mContext = context;
	mHandler = new Handler(this);		mHandler = new Handler(this);
	mIWindowManager = IWindowManager.Stub.asInterface(		mIWindowManager = IWindowManager.Stub.asInterface(

services/java/com/android/server/NotificationManagerService.java

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@ package com.android.server;

	import com.android.server.status.IconData;		import com.android.server.status.IconData;
	import com.android.server.status.NotificationData;		import com.android.server.status.NotificationData;
	import com.android.server.status.StatusBarService;		import com.android.server.status.StatusBarManagerService;

	import android.app.ActivityManagerNative;		import android.app.ActivityManagerNative;
	import android.app.IActivityManager;		import android.app.IActivityManager;
	@@ -86,7 +86,7 @@ class NotificationManagerService extends INotificationManager.Stub
	final IBinder mForegroundToken = new Binder();		final IBinder mForegroundToken = new Binder();

	private WorkerHandler mHandler;		private WorkerHandler mHandler;
	private StatusBarService mStatusBarService;		private StatusBarManagerService mStatusBar;
	private LightsService mLightsService;		private LightsService mLightsService;
	private LightsService.Light mBatteryLight;		private LightsService.Light mBatteryLight;
	private LightsService.Light mNotificationLight;		private LightsService.Light mNotificationLight;
	@@ -238,8 +238,8 @@ class NotificationManagerService extends INotificationManager.Stub
	}		}
	}		}

	private StatusBarService.NotificationCallbacks mNotificationCallbacks		private StatusBarManagerService.NotificationCallbacks mNotificationCallbacks
	= new StatusBarService.NotificationCallbacks() {		= new StatusBarManagerService.NotificationCallbacks() {

	public void onSetDisabled(int status) {		public void onSetDisabled(int status) {
	synchronized (mNotificationList) {		synchronized (mNotificationList) {
	@@ -405,7 +405,7 @@ class NotificationManagerService extends INotificationManager.Stub
	}		}
	}		}

	NotificationManagerService(Context context, StatusBarService statusBar,		NotificationManagerService(Context context, StatusBarManagerService statusBar,
	LightsService lights)		LightsService lights)
	{		{
	super();		super();
	@@ -417,7 +417,7 @@ class NotificationManagerService extends INotificationManager.Stub
	mToastQueue = new ArrayList<ToastRecord>();		mToastQueue = new ArrayList<ToastRecord>();
	mHandler = new WorkerHandler();		mHandler = new WorkerHandler();

	mStatusBarService = statusBar;		mStatusBar = statusBar;
	statusBar.setNotificationCallbacks(mNotificationCallbacks);		statusBar.setNotificationCallbacks(mNotificationCallbacks);

	mBatteryLight = lights.getLight(LightsService.LIGHT_ID_BATTERY);		mBatteryLight = lights.getLight(LightsService.LIGHT_ID_BATTERY);
	@@ -734,7 +734,7 @@ class NotificationManagerService extends INotificationManager.Stub
	r.statusBarKey = old.statusBarKey;		r.statusBarKey = old.statusBarKey;
	long identity = Binder.clearCallingIdentity();		long identity = Binder.clearCallingIdentity();
	try {		try {
	mStatusBarService.updateIcon(r.statusBarKey, icon, n);		mStatusBar.updateIcon(r.statusBarKey, icon, n);
	}		}
	finally {		finally {
	Binder.restoreCallingIdentity(identity);		Binder.restoreCallingIdentity(identity);
	@@ -742,7 +742,7 @@ class NotificationManagerService extends INotificationManager.Stub
	} else {		} else {
	long identity = Binder.clearCallingIdentity();		long identity = Binder.clearCallingIdentity();
	try {		try {
	r.statusBarKey = mStatusBarService.addIcon(icon, n);		r.statusBarKey = mStatusBar.addIcon(icon, n);
	mAttentionLight.pulse();		mAttentionLight.pulse();
	}		}
	finally {		finally {
	@@ -756,7 +756,7 @@ class NotificationManagerService extends INotificationManager.Stub
	if (old != null && old.statusBarKey != null) {		if (old != null && old.statusBarKey != null) {
	long identity = Binder.clearCallingIdentity();		long identity = Binder.clearCallingIdentity();
	try {		try {
	mStatusBarService.removeIcon(old.statusBarKey);		mStatusBar.removeIcon(old.statusBarKey);
	}		}
	finally {		finally {
	Binder.restoreCallingIdentity(identity);		Binder.restoreCallingIdentity(identity);
	@@ -864,7 +864,7 @@ class NotificationManagerService extends INotificationManager.Stub
	if (r.notification.icon != 0) {		if (r.notification.icon != 0) {
	long identity = Binder.clearCallingIdentity();		long identity = Binder.clearCallingIdentity();
	try {		try {
	mStatusBarService.removeIcon(r.statusBarKey);		mStatusBar.removeIcon(r.statusBarKey);
	}		}
	finally {		finally {
	Binder.restoreCallingIdentity(identity);		Binder.restoreCallingIdentity(identity);

services/java/com/android/server/SystemServer.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@
	package com.android.server;		package com.android.server;

	import com.android.server.am.ActivityManagerService;		import com.android.server.am.ActivityManagerService;
	import com.android.server.status.StatusBarService;		import com.android.server.status.StatusBarManagerService;
	import com.android.internal.os.BinderInternal;		import com.android.internal.os.BinderInternal;
	import com.android.internal.os.SamplingProfilerIntegration;		import com.android.internal.os.SamplingProfilerIntegration;

	@@ -206,7 +206,7 @@ class ServerThread extends Thread {
	}		}

	DevicePolicyManagerService devicePolicy = null;		DevicePolicyManagerService devicePolicy = null;
	StatusBarService statusBar = null;		StatusBarManagerService statusBar = null;
	InputMethodManagerService imm = null;		InputMethodManagerService imm = null;
	AppWidgetService appWidget = null;		AppWidgetService appWidget = null;
	NotificationManagerService notification = null;		NotificationManagerService notification = null;
	@@ -224,10 +224,10 @@ class ServerThread extends Thread {

	try {		try {
	Slog.i(TAG, "Status Bar");		Slog.i(TAG, "Status Bar");
	statusBar = new StatusBarService(context);		statusBar = new StatusBarManagerService(context);
	ServiceManager.addService(Context.STATUS_BAR_SERVICE, statusBar);		ServiceManager.addService(Context.STATUS_BAR_SERVICE, statusBar);
	} catch (Throwable e) {		} catch (Throwable e) {
	Slog.e(TAG, "Failure starting StatusBarService", e);		Slog.e(TAG, "Failure starting StatusBarManagerService", e);
	}		}

	try {		try {
	@@ -464,7 +464,7 @@ class ServerThread extends Thread {
	}		}

	// These are needed to propagate to the runnable below.		// These are needed to propagate to the runnable below.
	final StatusBarService statusBarF = statusBar;		final StatusBarManagerService statusBarF = statusBar;
	final BatteryService batteryF = battery;		final BatteryService batteryF = battery;
	final ConnectivityService connectivityF = connectivity;		final ConnectivityService connectivityF = connectivity;
	final DockObserver dockF = dock;		final DockObserver dockF = dock;

services/java/com/android/server/UiModeManagerService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -545,7 +545,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
	mStatusBarManager = (StatusBarManager) mContext.getSystemService(Context.STATUS_BAR_SERVICE);		mStatusBarManager = (StatusBarManager) mContext.getSystemService(Context.STATUS_BAR_SERVICE);
	}		}

	// Fear not: StatusBarService manages a list of requests to disable		// Fear not: StatusBarManagerService manages a list of requests to disable
	// features of the status bar; these are ORed together to form the		// features of the status bar; these are ORed together to form the
	// active disabled list. So if (for example) the device is locked and		// active disabled list. So if (for example) the device is locked and
	// the status bar should be totally disabled, the calls below will		// the status bar should be totally disabled, the calls below will

services/java/com/android/server/status/CloseDragHandle.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ import android.widget.LinearLayout;


	public class CloseDragHandle extends LinearLayout {		public class CloseDragHandle extends LinearLayout {
	StatusBarService mService;		StatusBarManagerService mService;

	public CloseDragHandle(Context context, AttributeSet attrs) {		public CloseDragHandle(Context context, AttributeSet attrs) {
	super(context, attrs);		super(context, attrs);