fix dont grant GPS permission_fine_location

grant permission.ACCESS_FINE_LOCATION to enable GPS

Change-Id: I97e99fde7c8cf5b1093015e3f9324873baf6da0a
CRs-Fixed: 2322042

1 files changed, 11 insertions, 0 deletions

diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java
index fb0c080db..4eddad62b 100755
--- a/src/com/android/camera/PermissionsActivity.java
+++ b/src/com/android/camera/PermissionsActivity.java
@@ -30,6 +30,7 @@ public class PermissionsActivity extends Activity {
     private boolean mShouldRequestCameraPermission;
     private boolean mShouldRequestMicrophonePermission;
     private boolean mShouldRequestLocationPermission;
+    private boolean mShouldRequestFineLocationPermission;
     private boolean mShouldRequestStoragePermission;
     private int mNumPermissionsToRequest;
     private boolean mFlagHasCameraPermission;
@@ -84,6 +85,11 @@ public class PermissionsActivity extends Activity {
             mNumPermissionsToRequest++;
             mShouldRequestLocationPermission = true;
         }
+        if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED) {
+            mNumPermissionsToRequest++;
+            mShouldRequestFineLocationPermission = true;
+        }
 
         if (mNumPermissionsToRequest != 0) {
             buildPermissionsRequest();
@@ -121,6 +127,11 @@ public class PermissionsActivity extends Activity {
             permissionsToRequest[permissionsRequestIndex] =
                     Manifest.permission.ACCESS_FINE_LOCATION;
             mIndexPermissionRequestLocation = permissionsRequestIndex;
+            permissionsRequestIndex++;
+        }
+        if (mShouldRequestFineLocationPermission) {
+            permissionsToRequest[permissionsRequestIndex] =
+                    Manifest.permission.ACCESS_FINE_LOCATION;
         }
         requestPermissions(permissionsToRequest, PERMISSION_REQUEST_CODE);
     }