diff options
author | Wang Han <416810799@qq.com> | 2018-09-12 12:25:31 +0800 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 20:06:32 +0200 |
commit | e4a8ad5bc71f8d2e84985ae7c1efbaa94849183b (patch) | |
tree | 7e4feaea62437beede72632864d31cc5f44ba4ba | |
parent | a76b2d2446847314868ad8f2fbb99ffd542065a8 (diff) | |
download | android_packages_apps_Camera2-e4a8ad5bc71f8d2e84985ae7c1efbaa94849183b.tar.gz android_packages_apps_Camera2-e4a8ad5bc71f8d2e84985ae7c1efbaa94849183b.tar.bz2 android_packages_apps_Camera2-e4a8ad5bc71f8d2e84985ae7c1efbaa94849183b.zip |
Camera2: Request for ACCESS_FINE_LOCATION permissionstaging/lineage-17.0_merge-android-10.0.0_r9
* ACCESS_COARSE_LOCATION only allows to access approximate location.
Change-Id: Ic512f574b32e01baa115a0a784f437c8225b85c3
-rw-r--r-- | AndroidManifest.xml | 1 | ||||
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/PermissionsActivity.java | 4 | ||||
-rw-r--r-- | src/com/android/camera/app/FirstRunDialog.java | 4 | ||||
-rw-r--r-- | src/com/android/camera/settings/CameraSettingsActivity.java | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6da5c1d94..09f6ee6dc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -8,7 +8,6 @@ android:minSdkVersion="19" android:targetSdkVersion="28" /> - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 2de3ae825..92f08107a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1956,7 +1956,7 @@ public class CameraActivity extends QuickActivity } if (!mHasCriticalPermissions || (mSettingsManager.getBoolean( SettingsManager.SCOPE_GLOBAL, Keys.KEY_RECORD_LOCATION) && - (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) + (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) && !mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL, Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS))) { diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java index aca4778e6..48f262f6c 100644 --- a/src/com/android/camera/PermissionsActivity.java +++ b/src/com/android/camera/PermissionsActivity.java @@ -137,7 +137,7 @@ public class PermissionsActivity extends QuickActivity { if (mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL, Keys.KEY_RECORD_LOCATION) - && (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) + && (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) { mNumPermissionsToRequest++; mShouldRequestLocationPermission = true; @@ -182,7 +182,7 @@ public class PermissionsActivity extends QuickActivity { permissionsRequestIndex++; } if (mShouldRequestLocationPermission) { - permissionsToRequest[permissionsRequestIndex] = Manifest.permission.ACCESS_COARSE_LOCATION; + permissionsToRequest[permissionsRequestIndex] = Manifest.permission.ACCESS_FINE_LOCATION; mIndexPermissionRequestLocation = permissionsRequestIndex; } diff --git a/src/com/android/camera/app/FirstRunDialog.java b/src/com/android/camera/app/FirstRunDialog.java index 58e1fcbba..35330fa85 100644 --- a/src/com/android/camera/app/FirstRunDialog.java +++ b/src/com/android/camera/app/FirstRunDialog.java @@ -210,11 +210,11 @@ public class FirstRunDialog { } private void checkLocationPermission() { - if (mContext.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) + if (mContext.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { Activity activity = (Activity) mContext; activity.requestPermissions( - new String[] {Manifest.permission.ACCESS_COARSE_LOCATION}, + new String[] {Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSION_REQUEST_CODE); mSettingsManager.set(SettingsManager.SCOPE_GLOBAL, Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS, true); diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java index a64770043..f6abc36cb 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -352,9 +352,9 @@ public class CameraSettingsActivity extends FragmentActivity { if (key.equals(Keys.KEY_RECORD_LOCATION) && sharedPreferences.getString(key, "0").equals("1")) { Context context = this.getActivity().getApplicationContext(); - if (context.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) + if (context.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { - requestPermissions(new String[] {Manifest.permission.ACCESS_COARSE_LOCATION}, + requestPermissions(new String[] {Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSION_REQUEST_CODE); } } |