summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to ↵Eric Laurent2014-11-182-4/+17
|\ | | | | | | | | | | | | A2DP when suspended." into lmp-mr1-dev * commit 'bfa77b5c687f217e26267693306aaa6cc8a63672': audio policy: do not prevent routing to A2DP when suspended.
| * am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP when ↵Eric Laurent2014-11-182-4/+17
| |\ | | | | | | | | | | | | | | | | | | suspended." into lmp-mr1-dev * commit '8cd37d677f10a7718c9247830652a588ea4600de': audio policy: do not prevent routing to A2DP when suspended.
| | * Merge "audio policy: do not prevent routing to A2DP when suspended." into ↵Eric Laurent2014-11-182-4/+17
| | |\ | | | | | | | | | | | | lmp-mr1-dev
| | | * audio policy: do not prevent routing to A2DP when suspended.Eric Laurent2014-11-172-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow A2DP sink selection even if A2DP is suspended. It is not because use of A2DP is temporarily disabled by SCO selection that the policy rule routing a given use case to A2DP should be altered. The source will be routed to A2DP but it will remain silent until suspend condition is cleared which is the purpose of suspend mode. Also make sure that accessibility prompts are audible while in call by forcing stream type to STREAM_VOICE_CALL. Fix inconsistent logic between AudioTrack::setStreamTypeFromAttributes() and AudioPolicyManager::getStrategyForAttr() Bug: 18095151. Change-Id: I1c75dd8288ed3dd494eb942060eac9c9660dca50
* | | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '5f3eef9a6a946347bc7d8c5dc76290c9e780f818': Remove extraneous parentheses
| * \ \ \ am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a20023576f48f06407a6ad1f016eec1943817ce': Remove extraneous parentheses
| | * \ \ \ Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| | |\ \ \ \
| | | * | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extraneous parentheses - they cause compiler warnings in clang Change-Id: Ie2efd9714f9e2251cf3b204b5c5dd1a8b8aaca13 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'dd9d3e5046da2b36c291957ccdf3291147b847f1': Fix uninitialized variable
| * | | | | | am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '48b447fe4e2dd1e3c121b614f745a7aa03f1535a': Fix uninitialized variable
| | * | | | | Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of !(err == OK && !mCancelled), sdpSize is used uninitialized. Change-Id: I33c6365ca6df13b0051491771d3eee3e35346b6d Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" ↵Jeff Tinker2014-11-181-1/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'efd33e8da29243b6bddf3f787034960b0717de90': Fix missing mutex lock in Drm::binderDied
| * | | | | am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '35b0f7095fac4f2cc112edd4b0298a9cb1ee394f': Fix missing mutex lock in Drm::binderDied
| | * | | | Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
| | |\ \ \ \
| | | * | | | Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18194977 Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
* | | | | | | am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks from mixing ↵Andy Hung2014-11-181-8/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data" into lmp-mr1-dev * commit 'a3e2c146eda841d84faa0093d26d7414de78bbaa': Prevent stopped audio tracks from mixing data
| * | | | | | am 4d0a5985: Merge "Prevent stopped audio tracks from mixing data" into ↵Andy Hung2014-11-181-8/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '4d0a5985fb5e7ea5a1f9a605afea2b7534ebc16b': Prevent stopped audio tracks from mixing data
| | * | | | | Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-devAndy Hung2014-11-181-8/+9
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static tracks should have zero framesReady when stopping or stopped, to prevent mixer from running potentially indefinitely with loop mode. Bug: 16070883 Change-Id: Iab9968044d1a6f8543bbcbfb246f49f27d68cace
* | | | | | | am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion ↵Andy Hung2014-11-181-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for decode." into lmp-mr1-dev * commit '1c764234f30941ab18ef2ba55299e2ce036c34b6': Fix race condition in signaling completion for decode.
| * | | | | | am 88ec9e99: Merge "Fix race condition in signaling completion for decode." ↵Andy Hung2014-11-171-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '88ec9e992af75f9783794df5d7be31c3b018ad09': Fix race condition in signaling completion for decode.
| | * | | | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-devAndy Hung2014-11-171-0/+1
| | |\ \ \ \ \
| | | * | | | | Fix race condition in signaling completion for decode.Andy Hung2014-11-171-0/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18048775 Change-Id: I2207eb2cf30cf205d9bf414edbb1d3e709185f67
* | | | | | | am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl ↵Robert Shih2014-11-186-0/+56
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getSelectedTrack" into lmp-mr1-dev * commit '811a92f68dbcab0f88b4be72099d783d3a44c9f6': NuPlayer HTTPLiveSource: impl getSelectedTrack
| * | | | | | am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into ↵Robert Shih2014-11-176-0/+56
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '39b109a1df23e7610b031b466e9ecf510b3c077f': NuPlayer HTTPLiveSource: impl getSelectedTrack
| | * | | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-176-0/+56
| | |\ \ \ \ \
| | | * | | | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-066-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17514665 Change-Id: I81c62553f2c5acb4d2436a9d8f04c10fdbe315d0
* | | | | | | | am 2b456a16: am f89f2ff4: Merge "audiopolicy: Update input device check in ↵Eric Laurent2014-11-171-3/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkInputsForDevice" into lmp-mr1-dev * commit '2b456a16ceeffd3d82dca71ce29c6479b8a11bff': audiopolicy: Update input device check in checkInputsForDevice
| * | | | | | | am f89f2ff4: Merge "audiopolicy: Update input device check in ↵Eric Laurent2014-11-171-3/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkInputsForDevice" into lmp-mr1-dev * commit 'f89f2ff4df0855eb56d95a02ab29d856e0ffa858': audiopolicy: Update input device check in checkInputsForDevice
| | * | | | | | Merge "audiopolicy: Update input device check in checkInputsForDevice" into ↵Eric Laurent2014-11-171-3/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | | audiopolicy: Update input device check in checkInputsForDeviceEric Laurent2014-11-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When an input device is disconnected, checkInputsForDevice clears dynamic fields of input profiles that are supporting the disconnected device. AUDIO_DEVICE_BIT_IN mask is missing while comparing with the supported input devices of a profile which is resulting in clearing wrong fields - Fix is to include AUDIO_DEVICE_BIT_IN in this comparison - also fix two other places where comparison with input device was not masked with AUDIO_DEVICE_BIT_IN. Bug: 18367045 Change-Id: Icc94b8353bc49567d8a6d6a75293c3b0dd42d83c
* | | | | | | | | am 26d92768: am 34c55e3e: Merge "No need to #include atomic-inline.h if you ↵Elliott Hughes2014-11-171-1/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have atomic.h." * commit '26d92768d6dac505903c96e842673ee9a57a0989': No need to #include atomic-inline.h if you have atomic.h.
| * | | | | | | | am 34c55e3e: Merge "No need to #include atomic-inline.h if you have atomic.h."Elliott Hughes2014-11-171-1/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '34c55e3ec5d4f6fdc2313ce904fb95b9ccdf9d72': No need to #include atomic-inline.h if you have atomic.h.
| | * | | | | | | Merge "No need to #include atomic-inline.h if you have atomic.h."Elliott Hughes2014-11-171-1/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79f9a53b95dcf84dff62ed4b3c0661c7c1e1fc64
* | | | | | | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1713-15/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b': Fix struct vs. class mismatches
| * | | | | | | | am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1713-15/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c80b9b834b2e443a2010e3b6d90d50d8b4a60fe4': Fix struct vs. class mismatches
| | * | | | | | | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1713-15/+14
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1713-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-172-19/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2716969d2b88e85a6ed5a766b54a0a34dc137118': libcutils no longer requires that its users configure ANDROID_SMP.
| * | | | | | | | | resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-172-19/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I0438bc8ae309d918d64818b5f8c5b0ec3ed972d1
| | * | | | | | | | Merge "libcutils no longer requires that its users configure ANDROID_SMP."Elliott Hughes2014-11-172-9/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-172-9/+0
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib91ff0696ab2472c62168eb5261bbda5d22f623e
* | | | | | | | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles ↵Chien-Yu Chen2014-11-173-73/+90
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly" into lmp-mr1-dev * commit '771a362de24be025e8283a91be4201d4d1d4b5d8': CameraService: normalize face rectangles properly
| * | | | | | | | am 3171f4e1: Merge "CameraService: normalize face rectangles properly" into ↵Chien-Yu Chen2014-11-173-73/+90
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '3171f4e12e5cabb2b496be6aa660aaa83e8fe77d': CameraService: normalize face rectangles properly
| | * | | | | | | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-devChien-Yu Chen2014-11-173-73/+90
| | |\ \ \ \ \ \ \
| | | * | | | | | | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use android.scaler.cropRegion reported in the capture result to normalize face rectangles instead of using the one in current capture request. Bug: 11460393 Change-Id: Id21834bf6ae1f7cc106b4dffb98f9f249a75034b
* | | | | | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1755-145/+143
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * | | | | | | | | am 9b77083e: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1755-145/+143
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b77083e582a8b6088ac6a2cb4151dfbdd324557': Update calls to IInterface::asBinder()
generated by cgit v1.1 at 2025-02-03 08:50:37 +0000