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

resolved conflicts for merge of 368fdba4 to master

Browse Source 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
This commit is contained in:
Brad Fitzpatrick
2010-10-21 07:39:10 -07:00
parent a376d030a2 368fdba47a
commit 385a753dea
15 changed files with 78 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/StatusBarManagerService.java
View File

@@ -54,7 +54,7 @@ import java.util.Map;
public class StatusBarManagerService extends IStatusBarService.Stub
{
static final String TAG = "StatusBarManagerService";
static final boolean SPEW = true;
static final boolean SPEW = false;
final Context mContext;
Handler mHandler = new Handler();
@@ -161,7 +161,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub
synchronized (mDisableRecords) {
manageDisableListLocked(what, token, pkg);
final int net = gatherDisableActionsLocked();
Slog.d(TAG, "disable... net=0x" + Integer.toHexString(net));
if (net != mDisabled) {
mDisabled = net;
mHandler.post(new Runnable() {