commit 076357b8567458d4b6dfdcf839ef751634cd2bfb
author The Android Open Source Project <initial-contribution@android.com> Tue Mar 03 14:04:24 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Tue Mar 03 14:04:24 2009 -0800
tree efbb2fd6f1dc67d2d606382fc3b82983e7cb2e1f
parent 3dec7d563a2f3e1eb967ce2054a00b6620e3558c

auto import from //depot/cupcake/@132589

services/java/com/android/server/PowerManagerService.java

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index ad30ffc..f41d21f 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -973,9 +973,11 @@
                 if (mSpew) {
                     Log.d(TAG, "mBroadcastWakeLock=" + mBroadcastWakeLock);
                 }
-                if (mContext != null && ActivityManagerNative.isSystemReady()) {
-                    mContext.sendOrderedBroadcast(mScreenOnIntent, null,
-                            mScreenOnBroadcastDone, mHandler, 0, null, null);
+                if (mContext != null) {
+                    if (ActivityManagerNative.isSystemReady()) {
+                        mContext.sendOrderedBroadcast(mScreenOnIntent, null,
+                                mScreenOnBroadcastDone, mHandler, 0, null, null);
+                    }
                 } else {
                     synchronized (mLocks) {
                         EventLog.writeEvent(LOG_POWER_SCREEN_BROADCAST_STOP, 2,
@@ -994,7 +996,7 @@
                     // ignore it.
                 }
 
-                if (mContext != null && ActivityManagerNative.isSystemReady()) {
+                if (mContext != null) {
                     mContext.sendOrderedBroadcast(mScreenOffIntent, null,
                             mScreenOffBroadcastDone, mHandler, 0, null, null);
                 } else {