commit ba9c39f06f44dc728c7a7a7d1ab0b2ded3a887f9
author Chris Banes <chrisbanes@google.com> Tue Jun 23 09:39:03 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 23 09:39:05 2015 +0000
tree 00862b8e5c1327a8a5e79754c62582ed51d5707a
parent 4e0a0984e80ced79b8aa3cf71fc261044ecc08a6
parent f0ec407dc5fdb420550ed29f9556909bd9f635a9

Merge "Stop spamming logcat with location permission denials" into mnc-dev

v7/appcompat/src/android/support/v7/app/TwilightManager.java

diff --git a/v7/appcompat/src/android/support/v7/app/TwilightManager.java b/v7/appcompat/src/android/support/v7/app/TwilightManager.java
index 5872330..b17d578 100644
--- a/v7/appcompat/src/android/support/v7/app/TwilightManager.java
+++ b/v7/appcompat/src/android/support/v7/app/TwilightManager.java
@@ -16,10 +16,12 @@
 
 package android.support.v7.app;
 
+import android.Manifest;
 import android.content.Context;
 import android.location.Location;
 import android.location.LocationManager;
 import android.support.annotation.NonNull;
+import android.support.v4.content.PermissionChecker;
 import android.text.format.DateUtils;
 import android.util.Log;
 
@@ -77,8 +79,20 @@
     }
 
     private Location getLastKnownLocation() {
-        Location coarseLocation = getLastKnownLocationForProvider(LocationManager.NETWORK_PROVIDER);
-        Location fineLocation = getLastKnownLocationForProvider(LocationManager.GPS_PROVIDER);
+        Location coarseLocation = null;
+        Location fineLocation = null;
+
+        int permission = PermissionChecker.checkSelfPermission(mContext,
+                Manifest.permission.ACCESS_FINE_LOCATION);
+        if (permission == PermissionChecker.PERMISSION_GRANTED) {
+            coarseLocation = getLastKnownLocationForProvider(LocationManager.NETWORK_PROVIDER);
+        }
+
+        permission = PermissionChecker.checkSelfPermission(mContext,
+                Manifest.permission.ACCESS_COARSE_LOCATION);
+        if (permission == PermissionChecker.PERMISSION_GRANTED) {
+            fineLocation = getLastKnownLocationForProvider(LocationManager.GPS_PROVIDER);
+        }
 
         if (coarseLocation != null && fineLocation != null) {
             // If we have both a fine and coarse location, use the latest