Merge "Fix NPE." into jb-mr1-dev

2012-08-22 13:17:22 -07:00
parent dfe5578771 b5b710a485
commit 6da92032da
1 changed files with 6 additions and 1 deletions
--- a/services/java/com/android/server/TwilightService.java
+++ b/services/java/com/android/server/TwilightService.java
@@ -50,7 +50,7 @@ import libcore.util.Objects;
 public final class TwilightService {
    private static final String TAG = "TwilightService";

-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;

    private static final String ACTION_UPDATE_TWILIGHT_STATE =
            "com.android.server.action.UPDATE_TWILIGHT_STATE";
@@ -463,6 +463,11 @@ public final class TwilightService {
        }

        private void updateTwilightState() {
+            if (mLocation == null) {
+                setTwilightState(null);
+                return;
+            }
+
            final long now = System.currentTimeMillis();

            // calculate yesterday's twilight