summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra...Steve Kondik2015-12-0729-307/+315
|\
| * Reduce lock time for dump to make sure not locked when calling back to IResou...Ronghua Wu2015-11-021-11/+26
| * ALooper::awaitResponse gets reply and returns immediately if the looper is st...Ronghua Wu2015-11-021-16/+4
| * GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8...Wei Jia2015-10-230-0/+0
| |\
| | * GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8...Wei Jia2015-10-221-0/+1
| | |\
| | | * GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8...Wei Jia2015-10-221-0/+1
| | | |\
| | | | * GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8...Wei Jia2015-10-221-0/+1
| | | | |\
| | | | | * GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838Wei Jia2015-10-221-0/+1
| | | | | |\
| | | | | | * GenericSource: reset mDecryptHandle when mDataSource is cleared.Wei Jia2015-10-221-0/+1
| | | | | | |\
| | | | | | | * GenericSource: reset mDecryptHandle when mDataSource is cleared.Wei Jia2015-10-221-0/+1
| * | | | | | | Merge "Workaround for busy wait bug" into mnc-dr-devGlenn Kasten2015-10-221-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Workaround for busy wait bugGlenn Kasten2015-10-221-1/+2
| * | | | | | | | Merge "Allow ALooper::awaitResponse to return immediately if the looper is st...Ronghua Wu2015-10-222-3/+30
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Allow ALooper::awaitResponse to return immediately if the looper is stopped.Ronghua Wu2015-10-222-3/+30
| | |/ / / / / / /
| * | | | | | | | Merge "GenericSource: reset mDecryptHandle when mDataSource is cleared." into...Wei Jia2015-10-221-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared.Wei Jia2015-10-221-0/+1
| * | | | | | | | | Merge "Fix offset adjustment when skipping off-spec meta chunk" into mnc-dr-devMarco Nelissen2015-10-221-3/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix offset adjustment when skipping off-spec meta chunkMarco Nelissen2015-10-221-3/+3
| * | | | | | | | | Merge "DO NOT MERGE: libcameraservice: Fix nullptr crash when no client." int...Ian Pedowitz2015-10-221-2/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | DO NOT MERGE: libcameraservice: Fix nullptr crash when no client.Tom Keel2015-10-211-2/+4
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485...Wei Jia2015-10-210-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | 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
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /