summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorzafir <zafir@google.com>2015-06-29 00:08:22 -0500
committerSteve Kondik <steve@cyngn.com>2016-08-18 15:07:20 -0700
commit219fbf4d3d7c47039c79822af26bace2849375e4 (patch)
tree34fcb84361c5e1b2f8da734aa74b47796f5c7aaa /res/values
parentdb4f5342e80662985c8bcb208e4fabf5c8db8a1a (diff)
downloadandroid_packages_apps_Snap-219fbf4d3d7c47039c79822af26bace2849375e4.tar.gz
android_packages_apps_Snap-219fbf4d3d7c47039c79822af26bace2849375e4.tar.bz2
android_packages_apps_Snap-219fbf4d3d7c47039c79822af26bace2849375e4.zip
Minimum viable Android M runtime permissions handling for H.
Creates new activity for permissions handling: both checking for permissions and handling error condition when critical permissions are not present. The reason for creating a new activity is so the app does not attempt to continue executing OnCreate, OnResume etc, which opens the camera while the dialogs are showing. This should not slow the app down because the permissions activity will only run when a) the first time the app has insufficient permissions and b) when a critical permission is missing and the app needs to shut down. Bug: 21273463 CRs-Fixed: 1019847 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5 (cherry picked from commit ad44cda82fe6ec5ee090115129223c6314f9e1bb) Fixes to M permissions. Previously, we called PermissionsActivity with startActivityForResult(). However, this creates race conditions as we check for permissions and the CameraActivity continues to operate. Now, we end CameraActivity and launch a new instance upon successful permissions resolution. We can also put the preload filmstrip logic back in its original place in onCreate. The checks for permissions happen in both onCreate and onResume. Bug: 22442745, 22478144, 22497152 CRs-Fixed: 1019847 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0 (cherry picked from commit ac0e2425e77a9b69e76d2f31876798825ea44584) SnapdragonCamera: Fixed M permission issue - Resolved NPE while sending permission request - Made change to request non-critical permissions once only, but the critical permssions all th time. - Removed unused contant defines CRs-Fixed: 1019847 Change-Id: Ib997244cbcc041d86c094c7ee7a902bff56e92ad snap: Remove platform signature * We are using runtime permissions now. Change-Id: I3386214dbbc0915251941ef490e7cbaf27e6ed45
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fecad0815..7f97f5a9c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -170,6 +170,12 @@
<!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
<string name="camera_disabled">Camera has been disabled because of security policies.</string>
+ <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+ <string name="error_permissions">The app does not have critical permissions needed to run. Please check your permissions settings.</string>
+
+ <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+ <string name="dialog_dismiss">Dismiss</string>
+
<!-- alert to the user to wait for some operation to complete -->
<string name="wait">Please wait\u2026</string>