Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Track camera and flashlight usage in battery stats. | Ruben Brunk | 2015-06-01 | 13 | -194/+541 |
* | Merge "mediaplayer: remove unused parameter needNotify in NuPlayer::performSe... | Wei Jia | 2015-05-16 | 2 | -13/+10 |
|\ | |||||
| * | mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek. | Wei Jia | 2015-05-15 | 2 | -13/+10 |
* | | Merge changes Ia529bf53,I10888d0b into mnc-dev | Chih-Hung Hsieh | 2015-05-15 | 2 | -12/+0 |
|\ \ | |||||
| * | | Enable building with clang/llvm. | Chih-Hung Hsieh | 2015-05-15 | 1 | -6/+0 |
| * | | Enable clang compilation. | Chih-Hung Hsieh | 2015-05-15 | 1 | -6/+0 |
* | | | Merge "MPEG4Writer: fix unintiialized member variables" into mnc-dev | Chong Zhang | 2015-05-15 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | MPEG4Writer: fix unintiialized member variables | Chong Zhang | 2015-05-15 | 1 | -0/+7 |
* | | | | Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-dev | Robert Shih | 2015-05-15 | 4 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Change mime for HLS timed ID3 stream to application/x-id3v4 | Robert Shih | 2015-05-14 | 4 | -4/+4 |
* | | | | | Merge "stagefright: check IMemory::pointer() before using the allocation" int... | Chong Zhang | 2015-05-15 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | stagefright: check IMemory::pointer() before using the allocation | Chong Zhang | 2015-05-15 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-dev | Robert Shih | 2015-05-15 | 1 | -13/+11 |
|\ \ \ \ \ | |||||
| * | | | | | HTTPLiveSource: fix non timed id3 track selection | Robert Shih | 2015-05-15 | 1 | -13/+11 |
| | |/ / / | |/| | | | |||||
* | | | | | am 0add5844: (-s ours) am 9bab4a20: am 46227b10: am 656802a3: am 69f80eeb: am... | Chong Zhang | 2015-05-15 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | am 9bab4a20: am 46227b10: am 656802a3: am 69f80eeb: am 84aea415: am 96a41a2b:... | Chong Zhang | 2015-05-15 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | am 46227b10: am 656802a3: am 69f80eeb: am 84aea415: am 96a41a2b: (-s ours) am... | Chong Zhang | 2015-05-15 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | am 656802a3: am 69f80eeb: am 84aea415: am 96a41a2b: (-s ours) am dbe6c320: HD... | Chong Zhang | 2015-05-15 | 0 | -0/+0 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | am 69f80eeb: am 84aea415: am 96a41a2b: (-s ours) am dbe6c320: HDCP: buffer ov... | Chong Zhang | 2015-05-14 | 0 | -0/+0 |
| | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ | am 84aea415: am 96a41a2b: (-s ours) am dbe6c320: HDCP: buffer over flow check... | Chong Zhang | 2015-05-14 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * \ \ \ \ | am 96a41a2b: (-s ours) am dbe6c320: HDCP: buffer over flow check -- DO NOT MERGE | Chong Zhang | 2015-05-14 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ | am dbe6c320: HDCP: buffer over flow check -- DO NOT MERGE | Chong Zhang | 2015-05-14 | 1 | -2/+24 |
| | | | | | | |\ \ \ \ \ | |||||
| | | | | | | | * | | | | | HDCP: buffer over flow check -- DO NOT MERGE | Chong Zhang | 2015-05-14 | 1 | -2/+24 |
* | | | | | | | | | | | | | camera2: Fix work-profile eviction handling. | Ruben Brunk | 2015-05-14 | 4 | -45/+102 |
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | am 1181db0d: (-s ours) am a6e9dd94: am 270caf9a: am 23d41fb1: am 2a9ccb66: am... | Chong Zhang | 2015-05-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | am a6e9dd94: am 270caf9a: am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: buffer... | Chong Zhang | 2015-05-14 | 1 | -2/+24 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 270caf9a: am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow ch... | Chong Zhang | 2015-05-14 | 1 | -2/+24 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow check -- DO NOT... | Chong Zhang | 2015-05-14 | 1 | -2/+24 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | * | | | | | | | am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow check -- DO NOT MERGE | Chong Zhang | 2015-05-14 | 1 | -2/+24 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | * | | | | | | am fd3a6e71: HDCP: buffer over flow check -- DO NOT MERGE | Chong Zhang | 2015-05-14 | 1 | -2/+24 |
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | |||||
| | | | | | * | | | | | HDCP: buffer over flow check -- DO NOT MERGE | Chong Zhang | 2015-05-14 | 1 | -2/+24 |
* | | | | | | | | | | | Merge "camera2: Fix empty set handling for eviction." into mnc-dev | Ruben Brunk | 2015-05-14 | 1 | -9/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | camera2: Fix empty set handling for eviction. | Ruben Brunk | 2015-05-14 | 1 | -9/+11 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge "stagefright: prevent more crashes in ACodec" into mnc-dev | Lajos Molnar | 2015-05-14 | 2 | -164/+307 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | stagefright: prevent more crashes in ACodec | Lajos Molnar | 2015-05-13 | 2 | -164/+307 |
* | | | | | | | | | | | | Merge "Camera: update CameraModule deriveKey" into mnc-dev | Yin-Chia Yeh | 2015-05-13 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Camera: update CameraModule deriveKey | Yin-Chia Yeh | 2015-05-07 | 1 | -0/+12 |
* | | | | | | | | | | | | | Merge "Camera: Cleanup to prepare() implementation" into mnc-dev | Eino-Ville Talvala | 2015-05-13 | 2 | -11/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Camera: Cleanup to prepare() implementation | Eino-Ville Talvala | 2015-05-13 | 2 | -11/+6 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | FwdLockConv.c: include what you use. | Adam Langley | 2015-05-13 | 1 | -0/+1 |
* | | | | | | | | | | | | | Merge "stagefright: Prevent crashes in ACodec - part 1" into mnc-dev | Jinsuk Kim | 2015-05-13 | 1 | -136/+219 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | stagefright: Prevent crashes in ACodec - part 1 | Jinsuk Kim | 2015-05-13 | 1 | -136/+219 |
* | | | | | | | | | | | | | Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into... | Chong Zhang | 2015-05-13 | 24 | -64/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | stagefright: rename usePersistentInputSurface to setInputSurface | Chong Zhang | 2015-05-13 | 24 | -64/+59 |
* | | | | | | | | | | | | | Merge "libmediaplayerservice: unlock before trying to reclaim drm session." i... | Ronghua Wu | 2015-05-13 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | libmediaplayerservice: unlock before trying to reclaim drm session. | Ronghua Wu | 2015-05-13 | 1 | -0/+11 |
* | | | | | | | | | | | | | | am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0:... | Lajos Molnar | 2015-05-13 | 3 | -6/+109 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add A... | Lajos Molnar | 2015-05-12 | 3 | -6/+109 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRa... | Lajos Molnar | 2015-05-12 | 3 | -6/+109 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use ... | Lajos Molnar | 2015-05-12 | 3 | -6/+109 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | | |