summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PermissionsActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera:Fix location permission dialog disappeared" into ↵Camera Software Integration2016-09-161-1/+0
|\ | | | | | | camera.lnx.1.0.c7-dev
| * SnapdragonCamera:Fix location permission dialog disappearedjunjiez2016-09-081-1/+0
| | | | | | | | | | | | | | | | | | Request loaction permission for the first time of launching Camera, and add android:configChanges in manifest to avoid PermissionActivity to be created when rotate screen. Change-Id: Ibaffad1629830beccf41e32ea5e224abd765ffb6 CRs-Fixed: 1059678
* | Merge "SnapdragonCamera: fix crash when deny storage permission" into ↵Camera Software Integration2016-09-131-11/+28
|\ \ | | | | | | | | | camera.lnx.1.0.c7-dev
| * | SnapdragonCamera: fix crash when deny storage permissionjunjiez2016-09-041-11/+28
| |/ | | | | | | | | | | | | | | | | | | The permission group of storage will not be granted automatically by system when one permission in the group is granted and this will only happen when device is not in default mode. So we need to request both read and write storage permissions. Change-Id: Id8ab4d2dd74a958c17fe3fab19bfe0a61909a602 CRs-Fixed: 1051976
* / SnapdragonCamera:Fix Camera GTS failture issue.junjiez2016-08-311-14/+9
|/ | | | | | | | | | GTS test will fail if use permission activity to return the result, so set FLAG_ACTIVITY_FORWARD_RESULT flag for the intent and let CameraActivity return the result directly. And add URI read permission to the return intent Change-Id: I224789bbd430d977234d2bcbea4e38e957b81142 CRs-Fixed: 1059964
* Merge "SnapdragonCamera: fix invoke camera failture caused by permissions" ↵Linux Build Service Account2016-08-181-4/+22
|\ | | | | | | into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: fix invoke camera failture caused by permissionsjunjiez2016-08-081-4/+22
| | | | | | | | | | | | | | | | | | When the other apps want to invoke camera by intent, if the permission needed by camera is not granted, camera will restart and the intent will be lost, so check the permission first before invoke camera with intents Change-Id: I2c403d2cd78453cc8afcda374969dac87a6becf6 CRs-Fixed: 1047924
* | SnapdragonCamera: Fix NPE caused by empty permission resultJay Wang2016-07-201-4/+8
|/ | | | | | | | | When request permission is cancelled, it returns empty result. Making change to check the length of result before accessing the result. Change-Id: Ic3e35c822e053fac7786d5e924ead8935feb1794 CRs-Fixed: 1041464
* SnapdragonCamera: Fix first-time crash and cleanup permissionsJay Wang2016-06-261-2/+2
| | | | | | | | | | | As onCreate skips the creation of setting manager when the critical permissions are not granted, this causes the onDestroy to call setting manager destroy function with null pointer. Fix the issue with null check. In addition, remove unused permissions from manifest file Change-Id: I99b5f09449aacfb7eb9a5771e446df75956a9827 CRs-Fixed: 1034202
* SnapdragonCamera: Fixed M permission issueJay Wang2016-06-021-8/+13
| | | | | | | | | | - 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
* Fixes to M permissions.zafir2016-06-021-3/+17
| | | | | | | | | | | | | | | 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)
* Minimum viable Android M runtime permissions handling for H.zafir2016-06-021-0/+167
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)