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

StatusBarService -> StatusBarManagerService

Browse Source 
Change-Id: I7efc245395bd91a656b30d420c9b080877162360
This commit is contained in:
Joe Onorato
2010-04-12 08:18:45 -07:00
parent 90233a1ee5
commit 089de88fc2
13 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -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(

20
services/java/com/android/server/NotificationManagerService.java
View File

@@ -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);

10
services/java/com/android/server/SystemServer.java
View File

@@ -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;

2
services/java/com/android/server/UiModeManagerService.java
View File

@@ -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

2
services/java/com/android/server/status/CloseDragHandle.java
View File

@@ -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);

6
services/java/com/android/server/status/ExpandedView.java
View File

@@ -27,7 +27,7 @@ import android.util.Slog;
public class ExpandedView extends LinearLayout { public class ExpandedView extends LinearLayout {
StatusBarService mService; StatusBarManagerService mService;
int mPrevHeight = -1; int mPrevHeight = -1;
public ExpandedView(Context context, AttributeSet attrs) { public ExpandedView(Context context, AttributeSet attrs) {
@@ -50,9 +50,9 @@ public class ExpandedView extends LinearLayout {
super.onLayout(changed, left, top, right, bottom); super.onLayout(changed, left, top, right, bottom);
int height = bottom - top; int height = bottom - top;
if (height != mPrevHeight) { if (height != mPrevHeight) {
//Slog.d(StatusBarService.TAG, "height changed old=" + mPrevHeight + " new=" + height); //Slog.d(StatusBarManagerService.TAG, "height changed old=" + mPrevHeight + " new=" + height);
mPrevHeight = height; mPrevHeight = height;
mService.updateExpandedViewPos(StatusBarService.EXPANDED_LEAVE_ALONE); mService.updateExpandedViewPos(StatusBarManagerService.EXPANDED_LEAVE_ALONE);
} }
} }
} }

2
services/java/com/android/server/status/IconMerger.java
View File

@@ -24,7 +24,7 @@ import android.widget.LinearLayout;
public class IconMerger extends LinearLayout { public class IconMerger extends LinearLayout {
StatusBarService service; StatusBarManagerService service;
StatusBarIcon moreIcon; StatusBarIcon moreIcon;
public IconMerger(Context context, AttributeSet attrs) { public IconMerger(Context context, AttributeSet attrs) {

18
services/java/com/android/server/status/NotificationViewList.java
View File

@@ -135,8 +135,8 @@ class NotificationViewList {
index++; index++;
} }
} }
Slog.e(StatusBarService.TAG, "Couldn't find notification in NotificationViewList."); Slog.e(StatusBarManagerService.TAG, "Couldn't find notification in NotificationViewList.");
Slog.e(StatusBarService.TAG, "notification=" + notification); Slog.e(StatusBarManagerService.TAG, "notification=" + notification);
dump(notification); dump(notification);
return 0; return 0;
} }
@@ -173,8 +173,8 @@ class NotificationViewList {
} }
void add(StatusBarNotification notification) { void add(StatusBarNotification notification) {
if (StatusBarService.SPEW) { if (StatusBarManagerService.SPEW) {
Slog.d(StatusBarService.TAG, "before add NotificationViewList" Slog.d(StatusBarManagerService.TAG, "before add NotificationViewList"
+ " notification.data.ongoingEvent=" + notification.data.ongoingEvent); + " notification.data.ongoingEvent=" + notification.data.ongoingEvent);
dump(notification); dump(notification);
} }
@@ -192,14 +192,14 @@ class NotificationViewList {
} }
list.add(index, notification); list.add(index, notification);
if (StatusBarService.SPEW) { if (StatusBarManagerService.SPEW) {
Slog.d(StatusBarService.TAG, "after add NotificationViewList index=" + index); Slog.d(StatusBarManagerService.TAG, "after add NotificationViewList index=" + index);
dump(notification); dump(notification);
} }
} }
void dump(StatusBarNotification notification) { void dump(StatusBarNotification notification) {
if (StatusBarService.SPEW) { if (StatusBarManagerService.SPEW) {
boolean showTime = false; boolean showTime = false;
String s = ""; String s = "";
for (int i=0; i<mOngoing.size(); i++) { for (int i=0; i<mOngoing.size(); i++) {
@@ -217,7 +217,7 @@ class NotificationViewList {
} }
s += " "; s += " ";
} }
Slog.d(StatusBarService.TAG, "NotificationViewList ongoing: " + s); Slog.d(StatusBarManagerService.TAG, "NotificationViewList ongoing: " + s);
s = ""; s = "";
for (int i=0; i<mLatest.size(); i++) { for (int i=0; i<mLatest.size(); i++) {
@@ -235,7 +235,7 @@ class NotificationViewList {
} }
s += " "; s += " ";
} }
Slog.d(StatusBarService.TAG, "NotificationViewList latest: " + s); Slog.d(StatusBarManagerService.TAG, "NotificationViewList latest: " + s);
} }
} }

6
services/java/com/android/server/status/StatusBarIcon.java
View File

@@ -153,7 +153,7 @@ class StatusBarIcon {
try { try {
r = context.getPackageManager().getResourcesForApplication(data.iconPackage); r = context.getPackageManager().getResourcesForApplication(data.iconPackage);
} catch (PackageManager.NameNotFoundException ex) { } catch (PackageManager.NameNotFoundException ex) {
Slog.e(StatusBarService.TAG, "Icon package not found: " + data.iconPackage, ex); Slog.e(StatusBarManagerService.TAG, "Icon package not found: " + data.iconPackage, ex);
return null; return null;
} }
} else { } else {
@@ -161,14 +161,14 @@ class StatusBarIcon {
} }
if (data.iconId == 0) { if (data.iconId == 0) {
Slog.w(StatusBarService.TAG, "No icon ID for slot " + data.slot); Slog.w(StatusBarManagerService.TAG, "No icon ID for slot " + data.slot);
return null; return null;
} }
try { try {
return r.getDrawable(data.iconId); return r.getDrawable(data.iconId);
} catch (RuntimeException e) { } catch (RuntimeException e) {
Slog.w(StatusBarService.TAG, "Icon not found in " Slog.w(StatusBarManagerService.TAG, "Icon not found in "
+ (data.iconPackage != null ? data.iconId : "<system>") + (data.iconPackage != null ? data.iconId : "<system>")
+ ": " + Integer.toHexString(data.iconId)); + ": " + Integer.toHexString(data.iconId));
} }

12
services/java/com/android/server/status/StatusBarService.java → services/java/com/android/server/status/StatusBarManagerService.java
View File

@@ -84,7 +84,7 @@ import java.util.Set;
* separately throughout the code, although they both use the same key, which is assigned * separately throughout the code, although they both use the same key, which is assigned
* when they are created. * when they are created.
*/ */
public class StatusBarService extends IStatusBarService.Stub public class StatusBarManagerService extends IStatusBarService.Stub
{ {
static final String TAG = "StatusBar"; static final String TAG = "StatusBar";
static final boolean SPEW = false; static final boolean SPEW = false;
@@ -144,7 +144,7 @@ public class StatusBarService extends IStatusBarService.Stub
switch (event.getKeyCode()) { switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_BACK: case KeyEvent.KEYCODE_BACK:
if (!down) { if (!down) {
StatusBarService.this.deactivate(); StatusBarManagerService.this.deactivate();
} }
return true; return true;
} }
@@ -236,7 +236,7 @@ public class StatusBarService extends IStatusBarService.Stub
/** /**
* Construct the service, add the status bar view to the window manager * Construct the service, add the status bar view to the window manager
*/ */
public StatusBarService(Context context) { public StatusBarManagerService(Context context) {
mContext = context; mContext = context;
mDisplay = ((WindowManager)context.getSystemService( mDisplay = ((WindowManager)context.getSystemService(
Context.WINDOW_SERVICE)).getDefaultDisplay(); Context.WINDOW_SERVICE)).getDefaultDisplay();
@@ -413,13 +413,13 @@ public class StatusBarService extends IStatusBarService.Stub
private void enforceStatusBar() { private void enforceStatusBar() {
mContext.enforceCallingOrSelfPermission( mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.STATUS_BAR, android.Manifest.permission.STATUS_BAR,
"StatusBarService"); "StatusBarManagerService");
} }
private void enforceExpandStatusBar() { private void enforceExpandStatusBar() {
mContext.enforceCallingOrSelfPermission( mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.EXPAND_STATUS_BAR, android.Manifest.permission.EXPAND_STATUS_BAR,
"StatusBarService"); "StatusBarManagerService");
} }
public void registerStatusBar(IStatusBar bar) { public void registerStatusBar(IStatusBar bar) {
@@ -1878,7 +1878,7 @@ public class StatusBarService extends IStatusBarService.Stub
} }
ArrayList<StatusBarNotification> list = null; ArrayList<StatusBarNotification> list = null;
if (pkgList != null) { if (pkgList != null) {
synchronized (StatusBarService.this) { synchronized (StatusBarManagerService.this) {
for (String pkg : pkgList) { for (String pkg : pkgList) {
list = mNotificationData.notificationsForPackage(pkg); list = mNotificationData.notificationsForPackage(pkg);
} }

6
services/java/com/android/server/status/StatusBarPolicy.java
View File

@@ -97,7 +97,7 @@ public class StatusBarPolicy {
private static final int AM_PM_STYLE = AM_PM_STYLE_GONE; private static final int AM_PM_STYLE = AM_PM_STYLE_GONE;
private final Context mContext; private final Context mContext;
private final StatusBarService mService; private final StatusBarManagerService mService;
private final Handler mHandler = new StatusBarHandler(); private final Handler mHandler = new StatusBarHandler();
private final IBatteryStats mBatteryStats; private final IBatteryStats mBatteryStats;
@@ -417,7 +417,7 @@ public class StatusBarPolicy {
} }
}; };
private StatusBarPolicy(Context context, StatusBarService service) { private StatusBarPolicy(Context context, StatusBarManagerService service) {
mContext = context; mContext = context;
mService = service; mService = service;
mSignalStrength = new SignalStrength(); mSignalStrength = new SignalStrength();
@@ -561,7 +561,7 @@ public class StatusBarPolicy {
} }
} }
public static void installIcons(Context context, StatusBarService service) { public static void installIcons(Context context, StatusBarManagerService service) {
sInstance = new StatusBarPolicy(context, service); sInstance = new StatusBarPolicy(context, service);
} }

4
services/java/com/android/server/status/StatusBarView.java
View File

@@ -34,7 +34,7 @@ public class StatusBarView extends FrameLayout {
static final int DIM_ANIM_TIME = 400; static final int DIM_ANIM_TIME = 400;
StatusBarService mService; StatusBarManagerService mService;
boolean mTracking; boolean mTracking;
int mStartX, mStartY; int mStartX, mStartY;
ViewGroup mNotificationIcons; ViewGroup mNotificationIcons;
@@ -94,7 +94,7 @@ public class StatusBarView extends FrameLayout {
@Override @Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) { protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh); super.onSizeChanged(w, h, oldw, oldh);
mService.updateExpandedViewPos(StatusBarService.EXPANDED_LEAVE_ALONE); mService.updateExpandedViewPos(StatusBarManagerService.EXPANDED_LEAVE_ALONE);
} }
@Override @Override

2
services/java/com/android/server/status/TrackingView.java
View File

@@ -26,7 +26,7 @@ import android.widget.LinearLayout;
public class TrackingView extends LinearLayout { public class TrackingView extends LinearLayout {
final Display mDisplay; final Display mDisplay;
StatusBarService mService; StatusBarManagerService mService;
boolean mTracking; boolean mTracking;
int mStartX, mStartY; int mStartX, mStartY;