summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am 2fc4970c: am 00720781: Null check when evaluating valid resolution sizeAlan Newberger2015-07-101-1/+1
|\ | | | | | | | | * commit '2fc4970c2631ec5593c4566a72d4524014b49a29': Null check when evaluating valid resolution size
| * am 00720781: Null check when evaluating valid resolution sizeAlan Newberger2015-07-101-1/+1
| |\ | | | | | | | | | | | | * commit '00720781f6703de532ddbc05238db5bf5fd7cd2d': Null check when evaluating valid resolution size
| | * Null check when evaluating valid resolution sizeAlan Newberger2015-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against nonexistent size so that logic to reset size preference can proceed BUG=22396405 Change-Id: Id508713ef91f632867366934e72fe939a839e228
* | | am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called ↵zafir2015-07-092-10/+9
|\| | | | | | | | | | | | | | | | | | | | without critical permissions. * commit '148d0b8e3fd412fa6a666e75484fe6b7e0465f5a': Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
| * | Launch PermissionsActivity if CameraActivity resume is called without ↵zafir2015-07-082-10/+9
| | | | | | | | | | | | | | | | | | | | | critical permissions. Bug: 22358833 Change-Id: I5c189d4976b9355d531e028ecc163bb67bae6987
* | | am 5c8c7d3c: Clear permissions check after successful PermissionsActivityAlan Newberger2015-07-081-0/+2
|\| | | | | | | | | | | | | | * commit '5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233': Clear permissions check after successful PermissionsActivity
| * | Clear permissions check after successful PermissionsActivityAlan Newberger2015-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the permissions activity indicates the user was successful, mark mHasCriticalPermissions true to allow the app to resume normally. BUG=22347017 Change-Id: I6b9bdd02382d071530529a08e8f8fe7faf02fe3b
* | | am c2d5d078: Restrict permission checks to M devicesAlan Newberger2015-07-082-0/+10
|\| | | | | | | | | | | | | | * commit 'c2d5d078821ca5e8de0c0d03b6603bf7c505c53f': Restrict permission checks to M devices
| * | Restrict permission checks to M devicesAlan Newberger2015-07-082-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add an ApiHelper check and only call checkSelfPermission if we are on M and the methods exist. BUG=22345681 Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8
* | | am ad44cda8: Minimum viable Android M runtime permissions handling for H.zafir2015-07-073-50/+283
|\| | | | | | | | | | | | | | * commit 'ad44cda82fe6ec5ee090115129223c6314f9e1bb': Minimum viable Android M runtime permissions handling for H.
| * | Minimum viable Android M runtime permissions handling for H.zafir2015-07-063-50/+283
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5
* | am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" ↵Alan Newberger2015-06-293-6/+12
|\| | | | | | | | | | | | | into ub-camera-haleakala * commit 'fd6f316adc5abfa071534642688bdf46f47a3925': Ensure CaptureModule/API2 works without front camera
| * Merge "Ensure CaptureModule/API2 works without front camera" into ↵Alan Newberger2015-06-293-6/+12
| |\ | | | | | | | | | ub-camera-haleakala
| | * Ensure CaptureModule/API2 works without front cameraAlan Newberger2015-06-253-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check in both first run dialogs, and the generated HardwareSpec, so that front cameras are only used if detected. BUG=21781461 Change-Id: I6844655b2fd3df90b649f5dfd6a006ef68dbf1da
* | | am 62240e14: Merge "Update filmstrip item on metadata update" into ↵Alan Newberger2015-06-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | ub-camera-haleakala * commit '62240e14e310aa06601b4d069f30c0190e7b5ef3': Update filmstrip item on metadata update
| * | Merge "Update filmstrip item on metadata update" into ub-camera-haleakalaAlan Newberger2015-06-291-1/+1
| |\ \
| | * | Update filmstrip item on metadata updateAlan Newberger2015-06-251-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to async metadata loading, when viewing an image progress bar, after progress completion the main handler hiding progress bar would also hide filmstrip buttons if in secure mode, but the async metadata handler was calling a restricted handler that would only update the controls, not hiding for secure, or updating overflow menu. This change ensures all UI aspects of the item update are processed upon metadata loading. BUG=21499182 Change-Id: I92f22667d836d6ece6aa8427d967ec8e038b1e77
* | | am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ↵Senpo Hu2015-06-273-4/+39
|\| | | | | | | | | | | | | | | | | | | | ub-camera-haleakala * commit '04a9f8b68dfc636e5d2194af18cc2022e6b8354f': Fix transform issue in CaptureIntent.
| * | Fix transform issue in CaptureIntent.Senpo Hu2015-06-253-4/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | On M, EventOnTextureViewLayoutChanged comes earlier during app initialization in StateForeground which doesn't handle it. So here in StateReadyForCapture, we pull the current preview layout size and inform ResourceSurfaceTexture to allow it to calculate transform. Noted that we also need to bring this fix to Ivvavik. Bug: 21786937 Bug: 20173626 Change-Id: I417aef2f09247e77059fc5b066cbf10602ce5cf1
* / AOSP Camera source should run camera2 API on MAlan Newberger2015-06-191-4/+2
|/ | | | | | | | | | In all cases has Camera2 app run in CaptureModule, using capability levels to configure in either LEGACY or LIMITED JPEG, or full ZSL mode. BUG=21490086 Change-Id: I75842e9afc8d6ef387dd6611a5251394e8318caa
* Fix for invalidated resolutions via upgradeI-Jong Lin2015-06-102-12/+50
| | | | | | | | | | | | | | | | | | | Bug: 21758681 There was a upgrade bug where an valid resolution of the previous version of the Camera App could then be invalidated the subsequent version of the Camera App. If there were no other valid resolutions of the same aspect ratio available to the app, the current Camera App would choose (0,0) as its default size and then write this value into the saved settings. This fix allows the current Camera App to consider other resolutions not of aspect ratio as a fallback resolution setting. Also, if an invalid resolution valid has been saved to the settings, it also ignores it and then resaves a valid resolution value to the settings. Change-Id: I08f19d1ee6491619e92697897b73e4fd33a19a00
* Refresh required for full-screen undo in filmstripI-Jong Lin2015-06-081-0/+7
| | | | | | | | | | | Bug: 21666018 A Glacier regression bug: when filmstrip is in full-screen mode, and an deletion is undone, a blank screen is shown. With the fix, the undo forces the filmstrip into its "filmstrip" mode and forces a refresh with the un-deleted image. Change-Id: Id99be5d4d06e220e8698821badff32dba9b43997
* Use Google Feedback CrashBuilder API to make reports easier to consume.Sascha Haeberling2015-05-292-14/+20
| | | | | | | | | | | | | | | | Manual Cherry-Pick Part 1 of http://ag/699672 Currently, Feedback reports don't include a stacktrace. You have to download a system log file to find it. This tweak allows us to see the stacktrace on the Report page itself. Example old report: https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517267704 Example new report: https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517601160 Change-Id: If5f0ed6c69e96fe5f3661af913ae1525f8594b75
* Fix for unusable camera after quick pause/resume and HDR+ switch ↵Gabriel Nava2015-05-282-12/+13
| | | | | | | | | | (camera-Haleakala) - Removing the hack for b/18854352 - Running the camera reopen camera operations and onReadyForCapture callback in a non-UI thread to avoid dead-locks Bug: 21025113 Change-Id: I5545148769d92e5a87ffa9b693397fd7737edee6
* Add logging for when a session knowingly failed.Sascha Haeberling2015-05-272-0/+9
| | | | | | Bug: 21169512 Change-Id: Ic1dc499785a97f7344e517f555fa5f7b3a1c7ea9
* Merge "Log capture session canceled events." into ub-camera-haleakalaPaul Rohde2015-05-273-1/+22
|\
| * Log capture session canceled events.Paul Rohde2015-05-273-1/+22
| | | | | | | | | | | | | | | | | | | | This will handle the edgecase where capture sessions may be canceled inbetween the time the button is pressed and the capture actually starts so that it is possible to subtract these cases out of the unsaved image data. Bug: 21169512 Change-Id: Ie226d81bb10acd90dc1297230d4b024b7cd2d4d6
* | Handling the GcamService timeout due to application in paused state ↵Gabriel Nava2015-05-271-1/+13
| | | | | | | | | | | | | | | | | | | | (camera-Haleakala) - When GcamService times out due to a pause state, all resources are released. - Releasing the gcam resources without showing the error dialog allows next resume operation to open the camera Bug: 21025113 Change-Id: I95a89fbf6ce2498c1323cd4d06383141cc7cb913
* | Fill out more EXIF data, closer parity to Nexus HALSpike Sprague2015-05-202-25/+73
| | | | | | | | | | | | bug: 21277434 Change-Id: I4e4d9b4bffa6b0a8ccb3e870d553643dd27d2356
* | Merge "Don't attempt to update thumbnail if session is finished." into ↵Sascha Haeberling2015-05-201-0/+5
|\ \ | | | | | | | | | ub-camera-haleakala
| * | Don't attempt to update thumbnail if session is finished.Sascha Haeberling2015-05-201-0/+5
| |/ | | | | | | | | | | Bug: 21167342 Change-Id: If2e4db523aa66e82809d30aa35fb9a30d124d9df
* / Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar ↵Gabriel Nava2015-05-201-3/+3
|/ | | | | | | (camera-Haleakala) Bug: 20957536 Change-Id: I6985d009e550f8f67ff36be3fce53c82ada0610e
* Merge "Log capture started and bytes on disk" into ub-camera-haleakalaPaul Rohde2015-05-205-17/+131
|\
| * Log capture started and bytes on diskPaul Rohde2015-05-205-17/+131
| | | | | | | | Change-Id: I3a62aed33f55b396b4940a7bc9e5da5131616890
* | Make filmstrip grey squares less common.Paul Rohde2015-05-181-1/+1
|/ | | | | | | | | | | | Increase the encoding priority of the intermediate thumbnails by changing the task priority to "Average". This causes the intermediate thumbs to run on their own thread pool, after the tiny thumbs are generated but allow them to not get prempted by slow, full jpg encoding tasks. Bug: 21169512 Change-Id: I2862acac724cf6302c896feeeb04702170cbf030
* Merge "Workaround of the face detection failure on L and N5" into ↵Pengchong Jin2015-05-151-2/+15
|\ | | | | | | ub-camera-haleakala
| * Workaround of the face detection failure on L and N5Pengchong Jin2015-05-151-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch is a workaround of the face detection failure on L and Nexus 5. For Nexus 5 on L, the current FD only works when the preview stream is configured as the first stream before the JPEG stream. This change lock the order by creating a capture session with the preview stream first, and then creating the normal capture session with preview and JPEG. Bug: b/21039466 Change-Id: Icb7f1f758bc9d7ca428c7a4748223072d39dd57f
* | Merge "Increase the default JPG buffer size." into ub-camera-haleakalaPaul Rohde2015-05-151-1/+1
|\ \
| * | Increase the default JPG buffer size.Paul Rohde2015-05-151-1/+1
| |/ | | | | | | | | BUG: 21162720 Change-Id: Ie9d634533778c254a000da92f0af2948d814b1dd
* / Fix for crash when switching cameras on KitKat (camera-haleakala)Gabriel Nava2015-05-131-19/+22
|/ | | | | | | | - Adding null check for hardwareSpec in CameraAppUI.onChangeCamera() - Hardware spec may not be available if call to get camera parameters hasn't finished yet Bug: 21118170 Change-Id: I5bf1b0328f2cae7211464ff136a31ace2577630f
* Merge "WAR of the face detection failure" into ub-camera-haleakalaPengchong Jin2015-05-135-16/+67
|\
| * WAR of the face detection failurePengchong Jin2015-05-115-16/+67
| | | | | | | | | | | | | | | | | | | | | | | | This patch gives a work-around of the face detection failure that occurs when the ZSL camera is used. It forces to request a preview frame followed by a 5-frame ZSL burst before requesting the repeated preview and ZSL streams. It also hides the first preview frame in order to avoid potential janks. We do this only for L, Nexus 6 and Haleakala. Bug: 20724126 Change-Id: I40b7861e07570ed53135b2d8d182b65c5799adac
* | Merge "Ensuring the right HDR icon is shown on camera switch ↵Gabriel Nava2015-05-122-16/+47
|\ \ | | | | | | | | | (camera-haleakala)" into ub-camera-haleakala
| * | Ensuring the right HDR icon is shown on camera switch (camera-haleakala)Gabriel Nava2015-05-122-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | - When switching cameras HDR+ icon was always shown in disabled state regardless of the actual support mode - Existing boolean setting to track device's HDR support is not enough - Changing global device's HDR support setting to string that can hold no-hdr, hdr or hdr-plus values Bug: 21037428 Change-Id: Ia9cf0484879a22a27e4deb0e4aa066ec806a43e6
* | | Merge "skip first run dialog when starting in secure mode" into ↵Alan Newberger2015-05-121-7/+14
|\ \ \ | |/ / |/| | | | | ub-camera-haleakala
| * | skip first run dialog when starting in secure modeAlan Newberger2015-05-121-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Go right into camera mode when starting from secure lockscreen, this restores prior behavior and avoids resume loops in double onResume workarounds. Bug: 21070237 Change-Id: I353bdd4b73c8c63e58710e35304b5c269458c72e
* | | Merge "Freezing preview in capture intent when image is exposed instead of ↵Gabriel Nava2015-05-121-10/+11
|\ \ \ | |/ / |/| | | | | shutter click (camera-haleakala)" into ub-camera-haleakala
| * | Freezing preview in capture intent when image is exposed instead of shutter ↵Gabriel Nava2015-05-111-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | click (camera-haleakala) - Removing preview freeze call from shutter button callback - Relocating preview freeze call to quick expose handler Bug: 20957671 Change-Id: Ie1c68ed52e04cdafd6f5894d001990a030d15761
* | | Merge "Hide no active camera NPE by defaulting to camera device -1" into ↵Paul Rohde2015-05-112-2/+10
|\ \ \ | |/ / |/| | | | | ub-camera-haleakala
| * | Hide no active camera NPE by defaulting to camera device -1Paul Rohde2015-05-112-2/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | NPE's can occur if no camera device is currently active. It's not feasable to rewire all parts of the codebase for this release to properly access the target camera device. This fix may lead to inconsistent setting persistance if in places where a NPE would otherwise occur. Bug: 21026362 Change-Id: I76c5b5fab429f61238a1ba91c0c52e839a431573
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 18:48:59 +0000