summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
Commit message (Expand)AuthorAgeFilesLines
* am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener int...Eino-Ville Talvala2014-11-271-144/+191
|\
| * CameraManager: Separate service listener into a singletonEino-Ville Talvala2014-11-261-144/+191
* | am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection r...Ruben Brunk2014-11-251-1/+3
|\ \ | |/
| * Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lm...Ruben Brunk2014-11-241-1/+3
| |\
| | * Camera2: Ignore unsupported face detection results in LEGACY.Ruben Brunk2014-11-201-1/+3
* | | am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensat...Ruben Brunk2014-11-211-0/+2
|\ \ \ | |/ /
| * | Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-devRuben Brunk2014-11-211-0/+2
| |\ \
| | * | Camera2: Doc updates for aeExposureCompensation.Ruben Brunk2014-11-201-0/+2
| | |/
* | | am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into l...Eino-Ville Talvala2014-11-211-3/+7
|\ \ \ | |/ /
| * | Camera: Add one more requirement to BURST_CAPTUREEino-Ville Talvala2014-11-171-3/+7
| |/
* | am 438f54db: am bad677f3: Merge "Camera2: Add BURST_CAPTURE capability flag" ...Eino-Ville Talvala2014-11-173-5/+48
|\ \ | |/
| * Camera2: Add BURST_CAPTURE capability flagEino-Ville Talvala2014-11-173-5/+48
* | am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-devRuben Brunk2014-11-152-1/+36
|\ \ | |/
| * Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-devRuben Brunk2014-11-152-1/+36
| |\
| | * camera2: Add READ_SETTINGS capability.Ruben Brunk2014-11-132-1/+36
* | | am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into ...Yuncheol Heo2014-11-141-1/+12
|\ \ \ | |/ /
| * | Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-devYuncheol Heo2014-11-141-1/+12
| |\ \
| | * | CEC: Fix a bug in HdmiPortInfo.createFromParcel().Yuncheol Heo2014-11-141-1/+12
* | | | am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-devYin-Chia Yeh2014-11-143-4/+36
|\ \ \ \ | |/ / /
| * | | Merge "Camera: doc update for independent 3A" into lmp-mr1-devYin-Chia Yeh2014-11-143-4/+36
| |\ \ \ | | |/ / | |/| |
| | * | Camera: doc update for independent 3AYin-Chia Yeh2014-11-133-4/+36
| | |/
* | | am 5f02d295: Merge "Don\'t unload the sound model on stopRecognition" into lm...Sandeep Siddhartha2014-11-121-0/+59
|\ \ \ | |/ /
| * | Don't unload the sound model on stopRecognitionSandeep Siddhartha2014-11-121-0/+59
| |/
* | am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording lister...Jungshik Jang2014-11-053-14/+26
|\ \ | |/
| * Add recorder address to all recording listerner apis.Jungshik Jang2014-11-053-14/+26
* | am e333e674: Add a function to boost screen brightness temporarily. automerge...Jeff Brown2014-11-011-1/+7
|\ \ | |/
| * am e333e674: Add a function to boost screen brightness temporarily.Jeff Brown2014-11-011-1/+7
| |\
| | * Add a function to boost screen brightness temporarily.Jeff Brown2014-10-311-1/+7
* | | am ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-devYuncheol Heo2014-10-2410-98/+126
|\ \ \ | |/ /
| * | CEC: Fix apilint errors.Yuncheol Heo2014-10-2410-98/+126
* | | Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev automerge: fa76518Yuncheol Heo2014-10-241-1/+1
|\ \ \ | |/ /
| * | CEC: Fix JavaDoc errors.Yuncheol Heo2014-10-241-1/+1
* | | am 5814bf1c: am 0608b932: CEC: Add a callback for vendor when HDMI control se...Yuncheol Heo2014-10-203-5/+37
|\ \ \ | |/ /
| * | CEC: Add a callback for vendor when HDMI control setting is changed.Yuncheol Heo2014-10-203-5/+37
* | | am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-devJinsuk Kim2014-10-202-0/+19
|\ \ \ | |/ /
| * | CEC: add getDeviceList()Jinsuk Kim2014-10-202-0/+19
* | | am b78c1679: am 1f9b32f0: Sensor documentation fixes.Aravind Akella2014-10-143-154/+177
|\ \ \ | |/ /
| * | Sensor documentation fixes.Aravind Akella2014-10-133-154/+177
* | | am 58d5a8b6: am 7e7a14c5: am eeec4b9e: am ef773e35: Merge changes Id09663d8,I...Eino-Ville Talvala2014-10-104-484/+2086
|\ \ \ | |/ /
| * | am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-094-484/+2086
| |\ \ | | |/
| | * Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-084-484/+2086
| | |\
| | | * Camera2: Docs cleanup, especially units and rangeEino-Ville Talvala2014-10-084-494/+1557
| | | * camera2: Update docs only for legacy devicesIgor Murashkin2014-10-034-21/+560
* | | | am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code"...Dianne Hackborn2014-10-101-1/+1
|\ \ \ \ | |/ / /
| * | | am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." in...Dianne Hackborn2014-10-091-1/+1
| |\ \ \ | | |/ /
| | * | Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-071-1/+1
| | |/
* | | am 684675f4: am d534b936: Merge "Change visibility of RecordSource into publi...Yuncheol Heo2014-10-071-1/+3
|\ \ \ | |/ /
| * | Change visibility of RecordSource into public.Jungshik Jang2014-10-021-1/+3
| |/
* | resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-021-1/+1
|\ \ | |/ |/|
| * Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-011-1/+1