From 86595f912d8593a9581a8bd99f1849b8e4505de3 Mon Sep 17 00:00:00 2001
From: Dan Elkouby <streetwalrus@codewalr.us>
Date: Sat, 19 Dec 2015 21:12:23 +0200
Subject: TwilightService: always fall back to timezone-based location

This allows using LiveDisplay when all location services are disabled.

Change-Id: I988656c323a759c15f2cafd2b9d73dba60e93d75
---
 .../core/java/com/android/server/twilight/TwilightService.java     | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'services')

diff --git a/services/core/java/com/android/server/twilight/TwilightService.java b/services/core/java/com/android/server/twilight/TwilightService.java
index a71961c..2185b19 100644
--- a/services/core/java/com/android/server/twilight/TwilightService.java
+++ b/services/core/java/com/android/server/twilight/TwilightService.java
@@ -309,6 +309,13 @@ public final class TwilightService extends SystemService {
                         }
                         sendEmptyMessageDelayed(MSG_ENABLE_LOCATION_UPDATES, mLastUpdateInterval);
                     }
+
+                    if (!networkLocationEnabled && mLocation == null) {
+                        if (DEBUG) {
+                            Slog.d(TAG, "Network location unavailable");
+                        }
+                        retrieveLocation();
+                    }
                     break;
 
                 case MSG_DO_TWILIGHT_UPDATE:
-- 
cgit v1.1