summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-0113-194/+541
* Merge "mediaplayer: remove unused parameter needNotify in NuPlayer::performSe...Wei Jia2015-05-162-13/+10
|\
| * mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek.Wei Jia2015-05-152-13/+10
* | Merge changes Ia529bf53,I10888d0b into mnc-devChih-Hung Hsieh2015-05-152-12/+0
|\ \
| * | Enable building with clang/llvm.Chih-Hung Hsieh2015-05-151-6/+0
| * | Enable clang compilation.Chih-Hung Hsieh2015-05-151-6/+0
* | | Merge "MPEG4Writer: fix unintiialized member variables" into mnc-devChong Zhang2015-05-151-0/+7
|\ \ \
| * | | MPEG4Writer: fix unintiialized member variablesChong Zhang2015-05-151-0/+7
* | | | Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-devRobert Shih2015-05-154-4/+4
|\ \ \ \
| * | | | Change mime for HLS timed ID3 stream to application/x-id3v4Robert Shih2015-05-144-4/+4
* | | | | Merge "stagefright: check IMemory::pointer() before using the allocation" int...Chong Zhang2015-05-151-2/+2
|\ \ \ \ \
| * | | | | stagefright: check IMemory::pointer() before using the allocationChong Zhang2015-05-151-2/+2
| | |/ / / | |/| | |
* | | | | Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-devRobert Shih2015-05-151-13/+11
|\ \ \ \ \
| * | | | | HTTPLiveSource: fix non timed id3 track selectionRobert Shih2015-05-151-13/+11
| | |/ / / | |/| | |
* | | | | am 0add5844: (-s ours) am 9bab4a20: am 46227b10: am 656802a3: am 69f80eeb: am...Chong Zhang2015-05-150-0/+0
|\ \ \ \ \
| * \ \ \ \ am 9bab4a20: am 46227b10: am 656802a3: am 69f80eeb: am 84aea415: am 96a41a2b:...Chong Zhang2015-05-150-0/+0
| |\ \ \ \ \
| | * \ \ \ \ am 46227b10: am 656802a3: am 69f80eeb: am 84aea415: am 96a41a2b: (-s ours) am...Chong Zhang2015-05-150-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ am 656802a3: am 69f80eeb: am 84aea415: am 96a41a2b: (-s ours) am dbe6c320: HD...Chong Zhang2015-05-150-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ am 69f80eeb: am 84aea415: am 96a41a2b: (-s ours) am dbe6c320: HDCP: buffer ov...Chong Zhang2015-05-140-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ am 84aea415: am 96a41a2b: (-s ours) am dbe6c320: HDCP: buffer over flow check...Chong Zhang2015-05-140-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ am 96a41a2b: (-s ours) am dbe6c320: HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-140-0/+0
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ am dbe6c320: HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
* | | | | | | | | | | | | camera2: Fix work-profile eviction handling.Ruben Brunk2015-05-144-45/+102
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | am 1181db0d: (-s ours) am a6e9dd94: am 270caf9a: am 23d41fb1: am 2a9ccb66: am...Chong Zhang2015-05-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | am a6e9dd94: am 270caf9a: am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: buffer...Chong Zhang2015-05-141-2/+24
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 270caf9a: am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow ch...Chong Zhang2015-05-141-2/+24
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow check -- DO NOT...Chong Zhang2015-05-141-2/+24
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am fd3a6e71: HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
* | | | | | | | | | | Merge "camera2: Fix empty set handling for eviction." into mnc-devRuben Brunk2015-05-141-9/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | camera2: Fix empty set handling for eviction.Ruben Brunk2015-05-141-9/+11
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge "stagefright: prevent more crashes in ACodec" into mnc-devLajos Molnar2015-05-142-164/+307
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stagefright: prevent more crashes in ACodecLajos Molnar2015-05-132-164/+307
* | | | | | | | | | | | Merge "Camera: update CameraModule deriveKey" into mnc-devYin-Chia Yeh2015-05-131-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Camera: update CameraModule deriveKeyYin-Chia Yeh2015-05-071-0/+12
* | | | | | | | | | | | | Merge "Camera: Cleanup to prepare() implementation" into mnc-devEino-Ville Talvala2015-05-132-11/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Camera: Cleanup to prepare() implementationEino-Ville Talvala2015-05-132-11/+6
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | FwdLockConv.c: include what you use.Adam Langley2015-05-131-0/+1
* | | | | | | | | | | | | Merge "stagefright: Prevent crashes in ACodec - part 1" into mnc-devJinsuk Kim2015-05-131-136/+219
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | stagefright: Prevent crashes in ACodec - part 1Jinsuk Kim2015-05-131-136/+219
* | | | | | | | | | | | | Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into...Chong Zhang2015-05-1324-64/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-1324-64/+59
* | | | | | | | | | | | | Merge "libmediaplayerservice: unlock before trying to reclaim drm session." i...Ronghua Wu2015-05-131-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | libmediaplayerservice: unlock before trying to reclaim drm session.Ronghua Wu2015-05-131-0/+11
* | | | | | | | | | | | | | am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0:...Lajos Molnar2015-05-133-6/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add A...Lajos Molnar2015-05-123-6/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRa...Lajos Molnar2015-05-123-6/+109
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use ...Lajos Molnar2015-05-123-6/+109
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |