summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Reduce lock time for dump to make sure not locked when calling back to...Ronghua Wu2015-11-021-11/+26
|\
| * Reduce lock time for dump to make sure not locked when calling back to IResou...Ronghua Wu2015-10-261-11/+26
* | Merge "ALooper::awaitResponse gets reply and returns immediately if the loope...Ronghua Wu2015-10-301-16/+4
|\ \
| * | ALooper::awaitResponse gets reply and returns immediately if the looper is st...Ronghua Wu2015-10-261-16/+4
* | | Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() opera...Zach Jang2015-10-271-1/+5
|\ \ \
| * \ \ Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() opera...Zach Jang2015-10-271-1/+5
| |\ \ \
| | * | | Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""Zach Jang2015-10-271-1/+5
* | | | | Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" ...Zach Jang2015-10-271-8/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" ...Zach Jang2015-10-271-8/+16
| |\ \ \ \
| | * | | | Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""Zach Jang2015-10-271-8/+16
* | | | | | Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-devZach Jang2015-10-271-16/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-devZach Jang2015-10-271-16/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert "AudioPolicyService: fix race in AudioCommandThread"Zach Jang2015-10-271-16/+8
* | | | | | Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" ...Zach Jang2015-10-271-5/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" ...Zach Jang2015-10-271-5/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Revert "audio policy: bind setMode() and setPhoneState() operations"Zach Jang2015-10-271-5/+1
* | | | | 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
| | | | | | | |\ \ \ \ \