summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Camera/gralloc: Add basic capability handling, support DEPTHEino-Ville Talvala2015-08-115-514/+824
| | | | | | | | | | | | | | | | | | | | Also fix bug with AE not correctly overriding sensor values when ON but still INACTIVE. - Add Y16 support to gralloc (treat exactly as RAW16) - Add Y16 output support to camera - Adds depth static and dynamic fields to camera: - poseRotation - poseTranslation - intrinsicCalibration - radialDistortion - availableDepthStreamConfigurations - availableDepthMinFrameDurations - availableDepthStallDurations - depthIsExclusive Bug: 20537722 Change-Id: If64bb2a698a8a49777f848cfc6401d8fba299541
* am 7edd1a22: (-s ours) am 4b7ce097: am 9fe34eba: am 34689229: (-s ours) am ↵Yu Ning2015-08-070-0/+0
|\ | | | | | | | | | | | | 02ef81b4: am 51af59bd: (-s ours) am 3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer * commit '7edd1a22bf31f23793b7f02e0ced9e7b7b748ed1': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| * am 4b7ce097: am 9fe34eba: am 34689229: (-s ours) am 02ef81b4: am 51af59bd: ↵Yu Ning2015-08-070-0/+0
| |\ | | | | | | | | | | | | | | | | | | (-s ours) am 3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer * commit '4b7ce09787da9d0fe83886a9d108b5cf040f2244': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | * am 9fe34eba: am 34689229: (-s ours) am 02ef81b4: am 51af59bd: (-s ours) am ↵Yu Ning2015-08-070-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer * commit '9fe34eba10fee82060545fdcbae94bbe75fcbb7d': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | * am 34689229: (-s ours) am 02ef81b4: am 51af59bd: (-s ours) am 3840dbf5: DO ↵Yu Ning2015-08-070-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer * commit '34689229db2be359644bc2c9e7246a47d5982bac': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | * am 02ef81b4: am 51af59bd: (-s ours) am 3840dbf5: DO NOT MERGE opengl: Fix ↵Yu Ning2015-08-070-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QemuPipeStream::readFully reading beyond end of buffer * commit '02ef81b4c9e9e8db4bc4e797f879aab666fca9e6': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | * am 51af59bd: (-s ours) am 3840dbf5: DO NOT MERGE opengl: Fix ↵Yu Ning2015-08-070-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QemuPipeStream::readFully reading beyond end of buffer * commit '51af59bd9c6f3d52ab48cc9099b99f071bbda5eb': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | | * am 3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading ↵Yu Ning2015-08-071-4/+6
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beyond end of buffer * commit '3840dbf546a311e7792d8ebde6202028d12f789a': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | | | * DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of bufferYu Ning2015-07-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GPU emulation is enabled, the emulator sometimes freezes, with an error message in logcat similar to the following: QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address Some users have reported the same issue, e.g.: https://code.google.com/p/android/issues/detail?id=170633 The root cause is that QemuPipeStream::readFully(void *buf, size_t len) may attempt to read beyond (buf + len), resulting in a -EFAULT return value from the goldfish/qemu pipe driver. Fix this bug to improve the stability of the emulator. In addition, - Add more information to the said error message to facilitate future debugging. - Use "%zu" instead of "%d" for logging size_t variables. Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992 Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
* | | | | | | | am e3d2c781: (-s ours) am b3f8cad0: am 280ec983: am b871b1a0: (-s ours) am ↵Yu Ning2015-08-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer * commit 'e3d2c781cc392b117fac57b77509dca893926f6e': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| * | | | | | | am b3f8cad0: am 280ec983: am b871b1a0: (-s ours) am 3f83b3fd: DO NOT MERGE ↵Yu Ning2015-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opengl: Fix QemuPipeStream::readFully reading beyond end of buffer * commit 'b3f8cad0747087e269bfe9fa9bf644a578d46f13': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | * | | | | | am 280ec983: am b871b1a0: (-s ours) am 3f83b3fd: DO NOT MERGE opengl: Fix ↵Yu Ning2015-08-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QemuPipeStream::readFully reading beyond end of buffer * commit '280ec983bf8036c82d02582e588faf92b4fbfa6a': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | * | | | | am b871b1a0: (-s ours) am 3f83b3fd: DO NOT MERGE opengl: Fix ↵Yu Ning2015-08-070-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QemuPipeStream::readFully reading beyond end of buffer * commit 'b871b1a06e24cc8ce863a2ab5a8fb4a4dcc85e1d': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | * | | | am 3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading ↵Yu Ning2015-08-071-4/+6
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beyond end of buffer * commit '3f83b3fdc3c3b0926e4d2f56788a9becdb92200b': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | * | | DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of bufferYu Ning2015-07-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GPU emulation is enabled, the emulator sometimes freezes, with an error message in logcat similar to the following: QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address Some users have reported the same issue, e.g.: https://code.google.com/p/android/issues/detail?id=170633 The root cause is that QemuPipeStream::readFully(void *buf, size_t len) may attempt to read beyond (buf + len), resulting in a -EFAULT return value from the goldfish/qemu pipe driver. Fix this bug to improve the stability of the emulator. In addition, - Add more information to the said error message to facilitate future debugging. - Use "%zu" instead of "%d" for logging size_t variables. Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992 Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
* | | | | | | | am d2ddfd29: (-s ours) am d88b2e76: am ad5614a1: DO NOT MERGE opengl: Fix ↵Yu Ning2015-08-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QemuPipeStream::readFully reading beyond end of buffer * commit 'd2ddfd29876e1e58256204d72c9091558d2daaea': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| * | | | | | | am d88b2e76: am ad5614a1: DO NOT MERGE opengl: Fix QemuPipeStream::readFully ↵Yu Ning2015-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading beyond end of buffer * commit 'd88b2e76f3c19a80477a7c2554760d20e8359fea': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | * | | | | | am ad5614a1: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading ↵Yu Ning2015-08-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beyond end of buffer * commit 'ad5614a19c1307fd8e2d01c525990af47e648de5': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | * | | | | DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of bufferYu Ning2015-07-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GPU emulation is enabled, the emulator sometimes freezes, with an error message in logcat similar to the following: QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address Some users have reported the same issue, e.g.: https://code.google.com/p/android/issues/detail?id=170633 The root cause is that QemuPipeStream::readFully(void *buf, size_t len) may attempt to read beyond (buf + len), resulting in a -EFAULT return value from the goldfish/qemu pipe driver. Fix this bug to improve the stability of the emulator. In addition, - Add more information to the said error message to facilitate future debugging. - Use "%zu" instead of "%d" for logging size_t variables. Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992 Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
* | | | | | | | am f378402b: (-s ours) am e40e60a6: DO NOT MERGE opengl: Fix ↵Yu Ning2015-08-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QemuPipeStream::readFully reading beyond end of buffer * commit 'f378402be9f51ed17eacbbd65f786d304bcb8dda': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| * | | | | | | am e40e60a6: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading ↵Yu Ning2015-08-071-4/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beyond end of buffer * commit 'e40e60a6ad91ac2c42837d1a9cb84037cc2a6e5f': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | * | | | | | DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of bufferYu Ning2015-07-211-4/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GPU emulation is enabled, the emulator sometimes freezes, with an error message in logcat similar to the following: QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address Some users have reported the same issue, e.g.: https://code.google.com/p/android/issues/detail?id=170633 The root cause is that QemuPipeStream::readFully(void *buf, size_t len) may attempt to read beyond (buf + len), resulting in a -EFAULT return value from the goldfish/qemu pipe driver. Fix this bug to improve the stability of the emulator. In addition, - Add more information to the said error message to facilitate future debugging. - Use "%zu" instead of "%d" for logging size_t variables. Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992 Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
* | | | | | | Merge "Camera: Update emulator camera v3 HAL to v3.3, module to v2.3" into ↵Eino-Ville Talvala2015-07-2810-412/+664
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | Camera: Update emulator camera v3 HAL to v3.3, module to v2.3Eino-Ville Talvala2015-07-2210-412/+664
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many updates to meet requirements of v3.3, including quite a few of metadata updates. Not all features promised by the metadata are actually wired up, though. Also adds initial support for capability selection based on system properties, though the selection isn't reflected in behavior outside the capability field for the most part. Sufficient to make the AOSP camera app run (and even record video), but not sufficient to pass all the CTS tests yet. Bug: 20537722 Change-Id: I0776fe361492402189569b7ab5c2f37b6900ffc5
* | | | | | | | Merge "opengl: Fix QemuPipeStream::readFully reading beyond end of buffer" ↵Konstantinos Menychtas2015-07-231-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | opengl: Fix QemuPipeStream::readFully reading beyond end of bufferYu Ning2015-07-221-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GPU emulation is enabled, the emulator sometimes freezes, with an error message in logcat similar to the following: QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address Some users have reported the same issue, e.g.: https://code.google.com/p/android/issues/detail?id=170633 The root cause is that QemuPipeStream::readFully(void *buf, size_t len) may attempt to read beyond (buf + len), resulting in a -EFAULT return value from the goldfish/qemu pipe driver. Fix this bug to improve the stability of the emulator. In addition, - Add more information to the said error message to facilitate future debugging. - Use "%zu" instead of "%d" for logging size_t variables. Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992 Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
* | | | | | | | Fix for MidiManager bug in emulatorRicardo Garcia2015-07-161-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Midi feature was not enabled in emulator. bug: 22087661 Change-Id: I9dbb3352701a4bd982658f9e95827bd8fcc74c38
* | | | | | | Fingerprint: Avoid passing structures by valueSasha Levitskiy2015-06-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 21282699 Change-Id: I33769066df031c1606f5f8721b7bac6f684c2400 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | | | Merge "remove video editor from media_profiles.xml" into mnc-devChong Zhang2015-05-301-46/+0
|\ \ \ \ \ \ \
| * | | | | | | remove video editor from media_profiles.xmlChong Zhang2015-05-271-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 17112465 Change-Id: Ic514d365c251f5b4d7a979e9a9d473875e5abc61
* | | | | | | | Handle un-enrolled fingerprint properlybohu2015-05-271-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For un-enrolled fingerprint, finger id 0 should be sent; previously nothing is sent. bug: 21342005 Change-Id: Ie32ae6c15fe63cd47657b3d95025542f09d77623
* | | | | | | | Start fingerprintd service on emulator imagebohu2015-05-271-0/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Id386d3baaf6f002d207d581dc96715de46f1b1a8
* | | | | | | Create SDK specific hardware feature list filebohu2015-05-221-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default feature list file includes bluetooth feature which does not exist on SDK system images. This file excludes the bluetooth feature and will be copied over to system/etc/permissions/handheld_core_hardware.xml. Another CL in build project will change the sdk_base.mk file to actually do the copying. bug: 21159206 Change-Id: Ie97e7f647c567ae8b9ee6ea3fe010d5b0a0047f3
* | | | | | | Don't use TEMP_FAILURE_RETRY with close in goldfish camera.Elliott Hughes2015-05-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/20501816 Change-Id: I622908cc02651d3c282edbc9c75ee6dd52b9c4c0 (cherry picked from commit fd22ea70a265c322e91eeb4703b10d1e9bd8f190)
* | | | | | | goldfish Hal: store/load user id and authenticator idbohu2015-05-031-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75dc8226a557483b671f1bac51a8d907f94e3e13
* | | | | | | goldfish Hal: store/read fingerprintsbohu2015-05-021-21/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save enrolled fingerprints and read them back; Check enrolled fingerprints during authentication; upgrade fingerprint api level to version 2 Change-Id: I3fca85e48f2469b5644beaae196a01634eb25dd5
* | | | | | | goldfish fp: fix issues with auth_token integrationAndres Morales2015-05-021-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - check hw_auth_token is present and challenge is met - store user_id in memory, and return in authenticated Still TODO: store enrolled FP, secure user id, and auth id in file Bug: 20766108 Change-Id: I28848020dd15c6bae44f77a557161387ac4e619e
* | | | | | | Add get_authenticator_id function to emulator fingerprint HALbohu2015-05-021-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib129493c6a69daa62b5a7e5b470163e266aa5fc3
* | | | | | | Use wildcard when matching device path.Jeff Sharkey2015-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20341087 Change-Id: Ic5d504c0b9f4d30fead9fff442c85929c89164b3
* | | | | | | Add pre_enroll method to fingerprint hal in emulatorbohu2015-04-221-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix the crash due to the lack of this method bug 20452665 Change-Id: I9b3d79140e15abb1bc52cfde42ece7f875f152d6
* | | | | | | Fingerprint: Update processed to authenticatedSasha Levitskiy2015-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bab6267cbf5b55a668a5cf53dfe58e3329a2946
* | | | | | | Fix build; Fix problems with SDK fingerprint emulation codeJim Miller2015-04-111-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix prototypes - Add new IDLE state - Fix potential memory corruption bug. Change-Id: If731c6123f3ccd4bb2055707d447a016100696a1
* | | | | | | Fix build: Remove LENS_POSITION from both HALv2 and HALv3Eino-Ville Talvala2015-04-102-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iffde8b14d3937808ce367d60d34fa638cea13497
* | | | | | | Merge "Merge commit '3bcf04b5befd26624505f1baeebf31c79df5a26f' into merge2"Etan Cohen2015-04-020-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit '3bcf04b5befd26624505f1baeebf31c79df5a26f' into merge2Etan Cohen2015-04-010-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | camera: Drop RAW_SENSOR, use RAW16 insteadMekala Natarajan2015-03-263-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I016831455ff2ef208ff5006f2860446245e2b965
| | * | | | | | | am 9f87f57d: (-s ours) am b04cfab3: (-s ours) am c3b67d31: Fix sdcard mount ↵bohu2015-03-180-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag for goldfish device DO NOT MERGE automerge: 0783093 -s ours * commit '0783093e23af03e161182f2760a0ae16276e90aa': Fix sdcard mount flag for goldfish device DO NOT MERGE
| | | * | | | | | | am 9f87f57d: (-s ours) am b04cfab3: (-s ours) am c3b67d31: Fix sdcard mount ↵bohu2015-03-130-0/+0
| | |/| | | | | | | | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag for goldfish device DO NOT MERGE * commit '9f87f57d58278b3837d44d96884dc63cbee501ad': Fix sdcard mount flag for goldfish device DO NOT MERGE
* | | | | | | | | Update fingerprint HAL to use authenticate() methodbohu2015-04-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8c271b167fc00f9c6d518f60bd58d3a1604dd0b
* | | | | | | | | Updated external storage configuration.Jeff Sharkey2015-03-301-13/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vold now manages external storage in a much more dynamic fashion, so we no longer need to define FUSE daemons or mount points. Bug: 19993667 Change-Id: I3405810222af7cdeb439f04bdd5410e49932ea3c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 17:46:49 +0000