From 56aabdf703779b97ef40cbef8fcde2620a379028 Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Tue, 19 Jul 2016 18:11:05 -0700
Subject: SnapdragonCamera: Remove custom location permission request window

When user enables the GPS locaion setting, use Android's run-time
permission request interface to get the permission.

Change-Id: Ib17171aeff5ccf20e2b00da08243dee1a3383611
CRs-Fixed: 1038039
---
 src/com/android/camera/WideAnglePanoramaModule.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/com/android/camera/WideAnglePanoramaModule.java')

diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 3f825dd39..210fe3600 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -895,6 +895,24 @@ public class WideAnglePanoramaModule
         }
     }
 
+    @Override
+    public void waitingLocationPermissionResult(boolean result) {
+        mLocationManager.waitingLocationPermissionResult(result);
+    }
+
+    @Override
+    public void enableRecordingLocation(boolean enable) {
+        String value = (enable ? RecordLocationPreference.VALUE_ON
+                        : RecordLocationPreference.VALUE_OFF);
+        if (mPreferences != null) {
+            mPreferences.edit()
+                .putString(CameraSettings.KEY_RECORD_LOCATION, value)
+                .apply();
+        }
+
+        mLocationManager.recordLocation(enable);
+    }
+
     @Override
     public void onPauseBeforeSuper() {
         mPaused = true;
-- 
cgit v1.2.3