summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485...Wei Jia2015-10-211-0/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485...Wei Jia2015-10-211-0/+1
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485...Wei Jia2015-10-211-0/+1
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485...Wei Jia2015-10-211-0/+1
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| | | | | * | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared.Wei Jia2015-10-211-0/+1
| | | | | |\ \ \ \ | | | | | | | |_|/ | | | | | | |/| |
| | | | | | * | | GenericSource: reset mDrmManagerClient when mDataSource is cleared.Wei Jia2015-10-211-0/+1
* | | | | | | | | Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." i...Wei Jia2015-10-211-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared.Wei Jia2015-10-191-0/+1
* | | | | | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-210-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-211-1/+3
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-211-1/+3
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-211-1/+3
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| |
| | | | | | * | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| | | | | | |\ \ \
| | | | | | | * \ \ Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into...Jon Larimer2015-10-201-1/+3
| | | | | | | | |\ \ \
| | | | | | | | | * | | stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-10-021-1/+3
* | | | | | | | | | | | Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-devChristian Bejram2015-10-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-devChristian Bejram2015-10-201-1/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | audio policy: bind setMode() and setPhoneState() operationsEric Laurent2015-10-161-1/+5
* | | | | | | | | | | | | Merge "AudioPolicyService: fix race in AudioCommandThread" into mnc-devChristian Bejram2015-10-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "AudioPolicyService: fix race in AudioCommandThread" into mnc-devChristian Bejram2015-10-201-8/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | AudioPolicyService: fix race in AudioCommandThreadEric Laurent2015-10-161-8/+16
* | | | | | | | | | | | | am 32ba6ec7: am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8:...Lajos Molnar2015-10-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stage...Lajos Molnar2015-10-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | | |/ / / / / / / / / /
| | * | | | | | | | | | am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check...Lajos Molnar2015-10-191-0/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for M...Lajos Molnar2015-10-191-0/+4
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList...Lajos Molnar2015-10-191-0/+4
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo...Lajos Molnar2015-10-191-0/+4
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-devLajos Molnar2015-10-191-0/+4
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | stagefright: check bounds for MediaCodecList.getCodecInfoLajos Molnar2015-10-121-0/+4
* | | | | | | | | | | | | libcameraservice: Fix ALOG prints in FlashLight.Ranjith Kagathi Ananda2015-10-161-4/+8
* | | | | | | | | | | | | Camera: frameworks: Add NULL check for callbackRanjith Kagathi Ananda2015-10-161-1/+5
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Reconcile with master after mass cherrypicksMarco Nelissen2015-10-161-0/+1
* | | | | | | | | | | | Merge "SoftAVCDec: Exit gracefully when memory allocation fails in the decode...Marco Nelissen2015-10-161-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SoftAVCDec: Exit gracefully when memory allocation fails in the decoderHarish Mahendrakar2015-10-161-0/+11
* | | | | | | | | | | | | Merge "SoftAVCDec: Added a check for unsupported resolutions" into mnc-dr-devMarco Nelissen2015-10-161-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | SoftAVCDec: Added a check for unsupported resolutionsHarish Mahendrakar2015-10-161-0/+11
* | | | | | | | | | | | | SoftHEVCDec: Reduced memory requirementsHarish Mahendrakar2015-10-162-248/+98
|/ / / / / / / / / / / /
* | | | | | | | | | | | SoftMPEG2Dec: Added support for deinterlacerHarish Mahendrakar2015-10-161-1/+2
* | | | | | | | | | | | Merge "audio policy: fix transition from VoIP to voice call on USB" into mnc-...Eric Laurent2015-10-151-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | audio policy: fix transition from VoIP to voice call on USBEric Laurent2015-10-151-0/+23
* | | | | | | | | | | | Merge "Camera: setup vendor tags before get_camera_info" into mnc-dr-devYin-Chia Yeh2015-10-151-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Camera: setup vendor tags before get_camera_infoYin-Chia Yeh2015-10-141-6/+7
* | | | | | | | | | | | Merge "audio policy: fix USB mic selection for VoIP" into mnc-dr-devEric Laurent2015-10-151-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | audio policy: fix USB mic selection for VoIPEric Laurent2015-10-151-2/+8
* | | | | | | | | | | | | Merge "SoundTrigger: fix binder call status reporting." into mnc-dr-devChris Thornton2015-10-152-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SoundTrigger: fix binder call status reporting.Eric Laurent2015-10-052-8/+13
* | | | | | | | | | | | | | Merge "Camera: Add video recording stop sound" into mnc-dr-devChien-Yu Chen2015-10-144-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \