summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
Commit message (Expand)AuthorAgeFilesLines
* Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev auto...Ruben Brunk2015-02-131-5/+7
|\
| * camera2: Fix legacy scaling factor application.Ruben Brunk2015-02-121-5/+7
* | resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aospAlex Klyubin2015-02-111-1/+1
|\ \
| * | Move hidden ApplicationInfo flags into a separate field.Alex Klyubin2015-02-111-1/+1
* | | am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and stri...Nick Vaccaro2015-02-112-1/+25
|\ \ \
| * | | Update API to contain new wrist tilt sensor type and string.Nick Vaccaro2015-02-102-1/+25
| | |/ | |/|
* | | am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture t...Zhijun He2015-02-082-4/+24
|\ \ \ | |/ /
| * | camera-metadata: clarify the AE precapture trigger specZhijun He2015-02-062-4/+24
* | | am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lm...Ruben Brunk2015-02-051-14/+46
|\ \ \ | |/ /
| * | Merge "camera2: Make legacy error handling more robust." into lmp-mr1-devRuben Brunk2015-02-051-14/+46
| |\ \
| | * | camera2: Make legacy error handling more robust.Ruben Brunk2015-02-041-14/+46
* | | | am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp...Zhijun He2015-02-051-2/+4
|\ \ \ \ | |/ / /
| * | | Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-devZhijun He2015-02-051-2/+4
| |\ \ \ | | |/ / | |/| |
| | * | Camera2: relax the EV compensation requirementsZhijun He2015-02-041-2/+4
* | | | am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112Lajos Molnar2015-02-031-3/+3
|\ \ \ \ | |/ / /
| * | | camera2: limit flexYUV array size in DngCreatorLajos Molnar2015-02-031-3/+3
* | | | am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the paramet...Jinsuk Kim2015-01-291-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "CEC: Do null/empty check against the parameter for checkRecordSource()...Jinsuk Kim2015-01-291-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | CEC: Do null/empty check against the parameter for checkRecordSource()Jinsuk Kim2015-01-291-0/+2
* | | | am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-...Eino-Ville Talvala2015-01-282-7/+7
|\ \ \ \ | |/ / /
| * | | Camera2 legacy: Do not advertise NV21 support.Eino-Ville Talvala2015-01-282-7/+7
| |/ /
* | | am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1...Jinsuk Kim2015-01-231-1/+46
|\ \ \ | |/ /
| * | Merge "CEC: Add logic to return to internal source" into lmp-mr1-devJinsuk Kim2015-01-231-1/+46
| |\ \
| | * | CEC: Add logic to return to internal sourceJinsuk Kim2015-01-221-1/+46
* | | | Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lm...Eino-Ville Talvala2015-01-233-28/+86
|\ \ \ \ | |/ / /
| * | | Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lm...Eino-Ville Talvala2015-01-233-28/+86
| |\ \ \ | | |/ / | |/| |
| | * | Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)Eino-Ville Talvala2015-01-213-28/+86
* | | | am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-devJinsuk Kim2015-01-201-1/+6
|\ \ \ \ | |/ / /
| * | | Mark TimeUnit as @SystemApiJinsuk Kim2015-01-211-1/+6
| |/ /
* | | am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the Im...Narayan Kamath2015-01-071-1/+1
|\ \ \ | | |/ | |/|
| * | camera2: Clarify the documentation on the ImageReader usecaseMartin Storsjo2015-01-071-1/+1
| * | am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-084-484/+2086
| |\ \
| * \ \ am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-081-1/+1
| |\ \ \
| * \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-021-1/+1
| |\ \ \ \
* | \ \ \ \ am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration mode...Yin-Chia Yeh2015-01-071-4/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Camera: doc update for color aberration modesYin-Chia Yeh2015-01-061-4/+3
* | | | | | am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" i...Jinsuk Kim2015-01-051-3/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | CEC: Let MHL device be of type 'source'Jinsuk Kim2015-01-051-3/+9
* | | | | | am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into...Ruben Brunk2014-12-121-20/+80
|\ \ \ \ \ \ | |/ / / / /
| * | | | | camera2: Fix LEGACY YUV production and orientation.Ruben Brunk2014-12-111-20/+80
* | | | | | Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." i...Ruben Brunk2014-12-094-81/+137
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." i...Ruben Brunk2014-12-094-81/+137
| |\ \ \ \ \
| | * | | | | Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.Ruben Brunk2014-12-094-81/+137
* | | | | | | am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards co...Eino-Ville Talvala2014-12-083-4/+38
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Camera2: Add HDR scene mode for backwards compatibility.Eino-Ville Talvala2014-12-053-4/+38
* | | | | | | am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." ...Zhentao Sun2014-12-081-3/+61
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-devZhentao Sun2014-12-041-3/+61
| |\ \ \ \ \ \
| | * | | | | | Fixed a leak in GeofenceHardwareImpl.java.Zhentao Sun2014-12-031-3/+61
* | | | | | | | am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr...Yin-Chia Yeh2014-12-044-9/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Camera: update antibanding spec" into lmp-mr1-devYin-Chia Yeh2014-12-034-9/+15
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
generated by cgit v1.1 at 2024-09-10 21:26:02 +0000