Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8... | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
| | | |\ | ||||||
| | | | * | GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
| | | | |\ | ||||||
| | | | | * | GenericSource: reset mDecryptHandle when mDataSource is cleared. | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
| | | | | |\ | ||||||
| | | | | | * | GenericSource: reset mDecryptHandle when mDataSource is cleared. | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
* | | | | | | | Merge "Workaround for busy wait bug" into mnc-dr-dev | Glenn Kasten | 2015-10-22 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Workaround for busy wait bug | Glenn Kasten | 2015-10-22 | 1 | -1/+2 | |
* | | | | | | | | Merge "Allow ALooper::awaitResponse to return immediately if the looper is st... | Ronghua Wu | 2015-10-22 | 2 | -3/+30 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Allow ALooper::awaitResponse to return immediately if the looper is stopped. | Ronghua Wu | 2015-10-22 | 2 | -3/+30 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge "GenericSource: reset mDecryptHandle when mDataSource is cleared." into... | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
* | | | | | | | | | Merge "Fix offset adjustment when skipping off-spec meta chunk" into mnc-dr-dev | Marco Nelissen | 2015-10-22 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix offset adjustment when skipping off-spec meta chunk | Marco Nelissen | 2015-10-22 | 1 | -3/+3 | |
* | | | | | | | | | Merge "DO NOT MERGE: libcameraservice: Fix nullptr crash when no client." int... | Ian Pedowitz | 2015-10-22 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | DO NOT MERGE: libcameraservice: Fix nullptr crash when no client. | Tom Keel | 2015-10-21 | 1 | -2/+4 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485... | Wei Jia | 2015-10-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485... | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485... | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | ||||||
| | | * | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485... | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | ||||||
| | | | * | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485... | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | ||||||
| | | | | * | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
| | | | | |\ \ \ \ | | | | | | | |_|/ | | | | | | |/| | | ||||||
| | | | | | * | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
* | | | | | | | | | Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." i... | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. | Wei Jia | 2015-10-19 | 1 | -0/+1 | |
* | | | | | | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in... | Jon Larimer | 2015-10-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in... | Jon Larimer | 2015-10-21 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in... | Jon Larimer | 2015-10-21 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | ||||||
| | | * | | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in... | Jon Larimer | 2015-10-21 | 1 | -1/+3 | |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | ||||||
| | | | * | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in... | Jon Larimer | 2015-10-21 | 1 | -1/+3 | |
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | ||||||
| | | | | * | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in... | Jon Larimer | 2015-10-20 | 1 | -1/+3 | |
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | ||||||
| | | | | | * | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in... | Jon Larimer | 2015-10-20 | 1 | -1/+3 | |
| | | | | | |\ \ \ | ||||||
| | | | | | | * \ \ | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in... | Jon Larimer | 2015-10-20 | 1 | -1/+3 | |
| | | | | | | |\ \ \ | ||||||
| | | | | | | | * \ \ | Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into... | Jon Larimer | 2015-10-20 | 1 | -1/+3 | |
| | | | | | | | |\ \ \ | ||||||
| | | | | | | | | * | | | stagefright: MPEG4Extractor: allow 'hdlr' box before first track | Lajos Molnar | 2015-10-02 | 1 | -1/+3 | |
* | | | | | | | | | | | | Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-dev | Christian Bejram | 2015-10-20 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-dev | Christian Bejram | 2015-10-20 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | audio policy: bind setMode() and setPhoneState() operations | Eric Laurent | 2015-10-16 | 1 | -1/+5 | |
* | | | | | | | | | | | | | Merge "AudioPolicyService: fix race in AudioCommandThread" into mnc-dev | Christian Bejram | 2015-10-20 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge "AudioPolicyService: fix race in AudioCommandThread" into mnc-dev | Christian Bejram | 2015-10-20 | 1 | -8/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | AudioPolicyService: fix race in AudioCommandThread | Eric Laurent | 2015-10-16 | 1 | -8/+16 | |
* | | | | | | | | | | | | | am 32ba6ec7: am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8:... | Lajos Molnar | 2015-10-19 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stage... | Lajos Molnar | 2015-10-19 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check... | Lajos Molnar | 2015-10-19 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for M... | Lajos Molnar | 2015-10-19 | 1 | -0/+4 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | ||||||
| | | | * | | | | | | | | am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList... | Lajos Molnar | 2015-10-19 | 1 | -0/+4 | |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | ||||||
| | | | | * | | | | | | | am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo... | Lajos Molnar | 2015-10-19 | 1 | -0/+4 | |
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | ||||||
| | | | | | * | | | | | | Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev | Lajos Molnar | 2015-10-19 | 1 | -0/+4 | |
| | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | stagefright: check bounds for MediaCodecList.getCodecInfo | Lajos Molnar | 2015-10-12 | 1 | -0/+4 | |
* | | | | | | | | | | | | | libcameraservice: Fix ALOG prints in FlashLight. | Ranjith Kagathi Ananda | 2015-10-16 | 1 | -4/+8 | |
* | | | | | | | | | | | | | Camera: frameworks: Add NULL check for callback | Ranjith Kagathi Ananda | 2015-10-16 | 1 | -1/+5 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Reconcile with master after mass cherrypicks | Marco Nelissen | 2015-10-16 | 1 | -0/+1 |