summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge \\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\" am: ↵Chih-Hung Hsieh2016-07-262-18/+18
|\ | | | | | | | | | | | | | | 02301db045 am: 529b548597 am: 4b2c9d6005 Change-Id: I7aca5d67077ce7603b15a83c362fa516e9615b84
| * Merge \\"Fix misc-macro-parentheses warnings in LegacyCamera.\\" am: 02301db045Chih-hung Hsieh2016-07-262-18/+18
| |\ | | | | | | | | | | | | | | | am: 529b548597 Change-Id: Ifb6fabf15f1e74fecfafe1f7854553083c544375
| | * Merge \"Fix misc-macro-parentheses warnings in LegacyCamera.\"Chih-Hung Hsieh2016-07-262-18/+18
| | |\ | |/ / | | | | | | | | | | | | am: 02301db045 Change-Id: I0dfa52fa470876beb8248397352a1ec299f4bb41
| | * Merge "Fix misc-macro-parentheses warnings in LegacyCamera."Chih-hung Hsieh2016-07-262-18/+18
| | |\
| | | * Fix misc-macro-parentheses warnings in LegacyCamera.Chih-Hung Hsieh2016-06-292-18/+18
| | |/ | | | | | | | | | | | | | | | | | | | | | Add parentheses around negative literals and parameters beside operators. Bug: 28705665 Test: build with clang-tidy Change-Id: I137330a75fecd571ad6444ebde3d9c5c70e15ef1
* | | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20Chih-Hung Hsieh2016-05-241-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | am: 323cb09f89 * commit '323cb09f8965758e2ad4d4c0f7196d4307d2f953': Fix misc-macro-parentheses warnings. Change-Id: Ic5337829ee5a53770f1f352cc5700defccffe8bd
| * | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69Chih-Hung Hsieh2016-05-241-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e3d129de20 * commit 'e3d129de200cd3ddd9bd5c63c54f032808a14816': Fix misc-macro-parentheses warnings. Change-Id: If3860faa8b582fa71a0aae72f5d7b795f53bf98a
| | * \ Merge "Fix misc-macro-parentheses warnings."Chih-Hung Hsieh2016-05-241-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d2cf3bda69 * commit 'd2cf3bda69b1286b6d2736a4e66a7e8b9cacc153': Fix misc-macro-parentheses warnings. Change-Id: I42e8a186d9f165135f4185e25be4f55506631420
| | | * Merge "Fix misc-macro-parentheses warnings."Treehugger Robot2016-05-241-1/+1
| | | |\ | | |/ /
| | | * Fix misc-macro-parentheses warnings.Chih-Hung Hsieh2016-05-121-1/+1
| | |/ | | | | | | | | | | | | Bug: 28705665 Change-Id: I034d8a7ff0ca6dbe179f5362f601cffc5b9522cf
* | | Prevent camera app crashes on changing hw.camera.* settings am: 996546fcf4Lingfeng Yang2016-05-031-2/+15
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | am: 892f4f594d * commit '892f4f594d0a158ef57ea0e2493822bc005edd49': Prevent camera app crashes on changing hw.camera.* settings Change-Id: Ic45745e8911c8ba7240be749b453e0d770b3ac18
| * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-05-031-2/+15
| |\ |/ / | | | | | | | | | | | | | | am: 996546fcf4 * commit '996546fcf4058d98d9aceecb4086283e17ae6c9d': Prevent camera app crashes on changing hw.camera.* settings Change-Id: I372bf5a00f021c89abda49966bc12eaca97a80c5
| * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-04-271-2/+15
|/ | | | | | | | | | | | | | | | | | | | | If the AVD's config.ini changes hw.camera.*, this is effectively, connecting/disconnecting camera hardware, and the current way in which camera settings are handled assumes that the set of cameras never changes, which can lead to the camera app crashing if the camera app was used successfuly with one configuration of hw.camera.* and then the AVD was restarted with a different configuration. In particular, the crash happens if the number of cameras has been reduced since the last run, and the camera app is looking up a preferred camera ID that is not supported by the new number of cameras. bug: 28417929 BUG: https://code.google.com/p/android/issues/detail?id=206945 Change-Id: Ib0e26ae77d376f31f3cc281e386d3c67291c1edc (cherry picked from commit 8f339abd9245577c348f5ba22322e8801c21faf8)
* am 33e28809: Merge "Add missing <string.h> include."Elliott Hughes2015-01-261-0/+2
|\ | | | | | | | | * commit '33e2880955ff459f976ae4ffe5aced65e0e25e53': Add missing <string.h> include.
| * Merge "Add missing <string.h> include."Elliott Hughes2015-01-261-0/+2
| |\
| | * Add missing <string.h> include.Elliott Hughes2015-01-261-0/+2
| |/ | | | | | | Change-Id: I985a631fcca9553e046ae63e03f1aba6f2ff812e
* | am e48f3382: Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
|\ \ | |/ | | | | | | * commit 'e48f33822a29d0cf0d72b68eb53e9662790e3fdb': Use and older standard version.
| * Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
| |\
| | * Use and older standard version.Dan Albert2014-11-201-0/+1
| |/ | | | | | | | | Bug: 18466763 Change-Id: I87f8e4c0e797caaaf7d7731ca0b2932e4aee5df6
* | am 090283cf: (-s ours) Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-210-0/+0
|\ \ | |/ | | | | | | * commit '090283cfff2a09f1ea960fd2ef87564099027ab0': Remove deprecated locales - DO NOT MERGE
| * Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-191-199/+0
| | | | | | | | Change-Id: I451ab9f4007679305f67f9ae657f49464caf64e0
* | Remove deprecated localesBaligh Uddin2014-07-171-199/+0
|/ | | | Change-Id: If35bd5efef047bcf7316c445559dfe16886ddbe6
* am d9b5d894: Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-210-0/+0
|\ | | | | | | | | * commit 'd9b5d8941d1ec47ff391da2b8cc8ec90f902062f': Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
| * Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-181-2/+0
| |\
| | * Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-181-2/+0
| |/ | | | | | | Change-Id: I2595238a8295150a211f172d0cbef1ed6b217ea1
* | Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-171-2/+0
| | | | | | | | Change-Id: I2595238a8295150a211f172d0cbef1ed6b217ea1
* | am 8e944e63: Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
|\ \ | |/ | | | | | | * commit '8e944e6303d1c952929989f56da6b9d97bb54b3c': Loading the corresponding library in LegacyCamera app
| * Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
| |\
| | * Loading the corresponding library in LegacyCamera appJun Tian2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The LegacyCamera app is loading wrong library in MosaicRenderer.java. It causes the camera app crash in the SDK image when changing the camera to panorma mode. Change-Id: I4c20af796622dd0e76a86ed7249d9b8fa54837b9
* | | am be2086de: Merge "Fix the loading library issue of panorama mode in ↵Glenn Kasten2014-01-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Legacycamera app" * commit 'be2086dee3fac7f0a07d329021bfa7cb449d916b': Fix the loading library issue of panorama mode in Legacycamera app
| * | Merge "Fix the loading library issue of panorama mode in Legacycamera app"Glenn Kasten2014-01-071-1/+1
| |\ \ | | |/ | |/|
| | * Fix the loading library issue of panorama mode in Legacycamera appJun Tian2013-07-041-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The Legacycamera app requires libjni_legacymosaic module, and this module is included in the makefile. But in the implementation code, it loads the libjni_mosaic module. This patch changed the loading library to fix crash issue when using panorama mode in the Legacycamera. Change-Id: Id7d4192b076412c674ef716c9ffcb31fe5cb6619 Signed-off-by: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Zhu Yanglinx <yanglinx.zhu@intel.com> Signed-off-by: Chang Panfeng <panfengx.chang@intel.com>
* | Remove deprecated localesBaligh Uddin2013-12-093-396/+0
|/ | | | | | Bug:11340849 Change-Id: I1c3fa9731b4d20f16bcfb88d070fba263086563e
* Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ | | | | | | Change-Id: I498b24819154fc97ab5f846cd088810d68a982ea
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
| |\
* | \ Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ | |/ / |/| / | |/ Change-Id: Idee820191b52f081d94c11787fe89452e1bf073d
| * Remove UI entry for disco video recording effect.Pin Ting2012-06-1454-55/+0
| | | | | | | | | | Bug:6294985 Change-Id: I7d10f694001b91eb81d0c8042e2f97bb0737a83c
* | Fix camera_control distorted in small resolution.akahuang2012-06-153-4/+10
| | | | | | | | | | | | | | Use minimum height of camera_control to fix it. bug:6228273 Change-Id: I7c623efe06e043664d696f753f08877cd34450a1
* | Remove UI entry for disco video recording effect.Pin Ting2012-06-1454-55/+0
|/ | | | | Bug:6294985 Change-Id: I7d10f694001b91eb81d0c8042e2f97bb0737a83c
* Fix NPE when only front cameras are available.Angus Kong2012-06-134-26/+9
| | | | | bug:6643208 Change-Id: Ie4eef4a671091cd9557d1c51ab5c3919b6b30652
* Rename Camera to LegacyCamera for SDK inclusion.Eino-Ville Talvala2012-06-047-22/+22
| | | | | | | The SDK needs a camera app that does not require GPU acceleration. The Camera app from 4.0.4 meets these requirements. Change-Id: Idb42d4b9e47d584ef1da10e3ba672d537c8db94b
* Fix the share popup. DO NOT MERGEAngus Kong2012-02-184-38/+9
| | | | | | | | | | Fix the share popup to comply with the new design: 1. Black background. 2. Image is centered. 3. Share popup won't rotate automatically. bug:6031042 Change-Id: I86b15a19bc8f7598d444cd9032960ea02e251668
* Import translations. DO NOT MERGEEric Fischer2012-02-088-50/+67
| | | | Change-Id: I0719643bd6d66a3990dbfd2b6eb9e2fc64ab307e
* Merge "Do not allow switching to other activities during panorama capture. ↵Wei Huang2012-01-201-0/+15
|\ | | | | | | (do not merge)" into ics-mr1
| * Do not allow switching to other activities during panorama capture. (do not ↵Wu-cheng Li2012-01-201-0/+15
| | | | | | | | | | | | | | merge) bug:5541182 Change-Id: I1cdbba9a8aec3b5c832f6e58baa26ff6312cf59a
* | Allow saving panorama after the activity is paused. (do not merge)Angus Kong2012-01-123-34/+75
|/ | | | | bug: 5541182 Change-Id: I42237d8dd4f8c39ddc2041ae32b886328a9c45c0
* Use default volume control stream instead of the music stream.Eino-Ville Talvala2012-01-051-2/+0
| | | | | | | | Since the Camera API is moving back to using the system audio stream, do not override the camera app volume control stream any more. Bug: 5778365 Change-Id: I27a6a1769d39cb0b246bce7d721d846f6c1430d1
* Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-12-062-3/+3
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-12-062-3/+3
| | | | | | | | Change-Id: If70739b6fc62ac7acf009355dc4cd5b9fabe8218
* | Fix crash after restoring defaults.Wu-cheng Li2011-12-061-0/+3
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | After restoring defaults in camcorder mode, the indicator control calls onSharedPreferenceChanged if record location is on. onSharedPreferenceChanged is also called in the end of restorePreferences. With two onSharedPreferenceChanged calls in a row, the first call notices effects have been disabled, and begins the effect pipeline teardown in the background thread. Normally, this would conclude in a few hundred milliseconds, and would then restart regular preview. However, with the second call to onSharedPreferenceChanged coming in right after the first, the method no longer sees an effect transition in progress (since current and new effect are equal to none now), and thus just ends up restarting preview. That attempt at restart runs into the crash because the main SurfaceView has not yet been released by the background effects thread. To fix this, InLineSettingSwitch should not invoke the listener when updating UI. bug:5679133 Change-Id: I06aca382105455585b633dc63f014a8f71ccadbe
generated by cgit v1.1 at 2024-05-20 17:22:37 +0000