Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "IAudioFlinger: clear config before reading it from parcel." into mnc-dev | Wei Jia | 2015-09-10 | 2 | -15/+29 |
|\ | |||||
| * | IAudioFlinger: clear config before reading it from parcel. | Wei Jia | 2015-09-09 | 2 | -15/+29 |
* | | Protect data source access with mutex during disconnect | Robert Shih | 2015-09-08 | 2 | -8/+24 |
* | | Merge "libstagefright: fix A_Refl to return immediately when there is an erro... | Wei Jia | 2015-09-08 | 2 | -2/+5 |
|\ \ | |/ |/| | |||||
| * | libstagefright: fix A_Refl to return immediately when there is an error. | Wei Jia | 2015-09-04 | 2 | -2/+5 |
* | | am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7:... | Robert Shih | 2015-09-04 | 2 | -3/+3 |
|\ \ | |||||
| * \ | am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2:... | Robert Shih | 2015-09-04 | 2 | -3/+3 |
| |\ \ | |||||
| | * \ | am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero ... | Robert Shih | 2015-09-04 | 2 | -3/+3 |
| | |\ \ | |||||
| | | * \ | am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return va... | Robert Shih | 2015-09-04 | 2 | -3/+3 |
| | | |\ \ | |||||
| | | | * \ | am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return values in media... | Robert Shih | 2015-09-04 | 2 | -3/+3 |
| | | | |\ \ | |||||
| | | | | * \ | am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls... | Robert Shih | 2015-09-03 | 2 | -3/+3 |
| | | | | |\ \ | |||||
| | | | | | * \ | am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev | Robert Shih | 2015-09-03 | 2 | -3/+3 |
| | | | | | |\ \ | |||||
| | | | | | | * \ | Merge "Zero out return values in media binder calls" into klp-dev | Robert Shih | 2015-09-03 | 2 | -3/+3 |
| | | | | | | |\ \ | |||||
| | | | | | | | * | | Zero out return values in media binder calls | Robert Shih | 2015-09-02 | 2 | -3/+3 |
* | | | | | | | | | | am 7734e37e: am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac:... | Andy Hung | 2015-09-04 | 1 | -7/+20 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130:... | Andy Hung | 2015-09-04 | 1 | -7/+20 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make ... | Andy Hung | 2015-09-04 | 1 | -7/+20 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect comma... | Andy Hung | 2015-09-04 | 1 | -7/+20 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more robus... | Andy Hung | 2015-09-04 | 1 | -7/+20 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | * | | | | | am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try... | Andy Hung | 2015-09-03 | 1 | -7/+20 |
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | |||||
| | | | | | * | | | | am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev | Andy Hung | 2015-09-03 | 1 | -7/+20 |
| | | | | | |\ \ \ \ | | | | | | | |/ / / | |||||
| | | | | | | * | | | Merge "Make IEffect command more robust (second try)" into klp-dev | Andy Hung | 2015-09-03 | 1 | -7/+20 |
| | | | | | | |\ \ \ | |||||
| | | | | | | | * | | | Make IEffect command more robust (second try) | Andy Hung | 2015-09-02 | 1 | -7/+20 |
| | | | | | | | |/ / | |||||
* | | | | | | | | | | am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007:... | Marco Nelissen | 2015-09-04 | 2 | -254/+377 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428:... | Marco Nelissen | 2015-09-04 | 2 | -254/+377 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix t... | Marco Nelissen | 2015-09-04 | 2 | -254/+377 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext pars... | Marco Nelissen | 2015-09-04 | 2 | -254/+377 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp... | Marco Nelissen | 2015-09-04 | 2 | -254/+377 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | * | | | | | am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev | Marco Nelissen | 2015-09-03 | 2 | -254/+377 |
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | |||||
| | | | | | * | | | | am 74888428: Merge "Fix timedtext parsing" into klp-dev | Marco Nelissen | 2015-09-03 | 2 | -254/+377 |
| | | | | | |\ \ \ \ | | | | | | | |/ / / | |||||
| | | | | | | * | | | Merge "Fix timedtext parsing" into klp-dev | Marco Nelissen | 2015-09-03 | 2 | -254/+377 |
| | | | | | | |\ \ \ | |||||
| | | | | | | | * | | | Fix timedtext parsing | Marco Nelissen | 2015-08-31 | 2 | -254/+377 |
| | | | | | | | |/ / | |||||
* | | | | | | | | | | am 1a844448: (-s ours) am 933fd689: am ec58a72b: am bf03b948: am 75143f30: am... | Wei Jia | 2015-09-04 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 933fd689: am ec58a72b: am bf03b948: am 75143f30: am 03b7f72b: (-s ours) am... | Wei Jia | 2015-09-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am ec58a72b: am bf03b948: am 75143f30: am 03b7f72b: (-s ours) am 9d916c77: DO... | Wei Jia | 2015-09-04 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | am bf03b948: am 75143f30: am 03b7f72b: (-s ours) am 9d916c77: DO NOT MERGE - ... | Wei Jia | 2015-09-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | am 75143f30: am 03b7f72b: (-s ours) am 9d916c77: DO NOT MERGE - libstagefrigh... | Wei Jia | 2015-09-04 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | * | | | | | am 03b7f72b: (-s ours) am 9d916c77: DO NOT MERGE - libstagefright: sanity che... | Wei Jia | 2015-09-03 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | |||||
| | | | | | * | | | | am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before derefere... | Wei Jia | 2015-09-03 | 1 | -5/+16 |
| | | | | | |\ \ \ \ | | | | | | | |/ / / | |||||
| | | | | | | * | | | DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer... | Wei Jia | 2015-09-03 | 1 | -5/+16 |
* | | | | | | | | | | am e457eb05: resolved conflicts for 3b8747ca to lmp-mr1-ub-dev | Wei Jia | 2015-09-04 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | resolved conflicts for 3b8747ca to lmp-mr1-ub-dev | Wei Jia | 2015-09-04 | 1 | -8/+28 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am ce34a82f: am 7ea22fce: am c6a2815e: DO NOT MERGE - libstagefright: sanity ... | Wei Jia | 2015-09-04 | 1 | -8/+28 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | am 7ea22fce: am c6a2815e: DO NOT MERGE - libstagefright: sanity check size be... | Wei Jia | 2015-09-04 | 1 | -8/+28 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | | * | | | | | am c6a2815e: DO NOT MERGE - libstagefright: sanity check size before derefere... | Wei Jia | 2015-09-04 | 1 | -8/+28 |
| | | | |\ \ \ \ \ | | | | | |/ / / / | |||||
| | | | | * | | | | DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer... | Wei Jia | 2015-09-03 | 1 | -8/+28 |
* | | | | | | | | | am 4abb48c3: am 898e8575: am 72b0abdf: Merge "Zero out return values in audio... | Robert Shih | 2015-09-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 898e8575: am 72b0abdf: Merge "Zero out return values in audio binder calls... | Robert Shih | 2015-09-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am 72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr... | Robert Shih | 2015-09-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Merge "Zero out return values in audio binder calls" into lmp-mr1-dev | Robert Shih | 2015-09-03 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ |