Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility." | Dan Albert | 2014-11-20 | 6 | -15/+21 |
|\ | |||||
| * | am 902dc42d: am 07715ac3: Merge "C++11 compatibility." | Dan Albert | 2014-11-20 | 6 | -15/+21 |
| |\ | |||||
| | * | C++11 compatibility. | Dan Albert | 2014-11-20 | 6 | -15/+21 |
* | | | am a848844f: am cb79b3db: am 03181012: Merge "Camera2Client: remove recording... | Yin-Chia Yeh | 2014-11-19 | 3 | -7/+56 |
|\ \ \ | |/ / | |||||
| * | | am cb79b3db: am 03181012: Merge "Camera2Client: remove recording stream if ne... | Yin-Chia Yeh | 2014-11-19 | 3 | -7/+56 |
| |\ \ | |||||
| | * \ | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-dev | Yin-Chia Yeh | 2014-11-19 | 3 | -7/+56 |
| | |\ \ | |||||
| | | * | | Camera2Client: remove recording stream if necessary | Yin-Chia Yeh | 2014-11-18 | 3 | -7/+56 |
* | | | | | Merge "Fix AudioMixer floating interaction with downmixer" | Andy Hung | 2014-11-19 | 4 | -56/+136 |
|\ \ \ \ \ | |||||
| * | | | | | Fix AudioMixer floating interaction with downmixer | Andy Hung | 2014-11-07 | 4 | -56/+136 |
* | | | | | | Merge "Move AudioMixer buffer provider preparation into track" | Andy Hung | 2014-11-19 | 2 | -74/+66 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Move AudioMixer buffer provider preparation into track | Andy Hung | 2014-11-07 | 2 | -74/+66 |
* | | | | | | am 640228b8: am 9b323821: am e4044209: Merge "Disable clang++ due to compiler... | Chih-Hung Hsieh | 2014-11-19 | 2 | -0/+12 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error." | Chih-Hung Hsieh | 2014-11-19 | 2 | -0/+12 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge "Disable clang++ due to compiler error." | Chih-Hung Hsieh | 2014-11-18 | 2 | -0/+12 |
| | |\ \ \ \ | |||||
| | | * | | | | Disable clang++ due to compiler error. | Chih-Hung Hsieh | 2014-11-14 | 2 | -0/+12 |
* | | | | | | | am 9544a8e9: am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent ro... | Eric Laurent | 2014-11-18 | 1 | -4/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP... | Eric Laurent | 2014-11-18 | 1 | -4/+12 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp... | Eric Laurent | 2014-11-18 | 1 | -4/+12 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | audio policy: do not prevent routing to A2DP when suspended. | Eric Laurent | 2014-11-17 | 1 | -4/+12 |
* | | | | | | | | am a248703b: am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks fr... | Andy Hung | 2014-11-18 | 1 | -8/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks from mixing dat... | Andy Hung | 2014-11-18 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-dev | Andy Hung | 2014-11-18 | 1 | -8/+9 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | Prevent stopped audio tracks from mixing data | Andy Hung | 2014-11-17 | 1 | -8/+9 |
| | | | |_|_|/ | | | |/| | | | |||||
* | | | | | | | am 22bfb336: am 2b456a16: am f89f2ff4: Merge "audiopolicy: Update input devic... | Eric Laurent | 2014-11-17 | 1 | -3/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 2b456a16: am f89f2ff4: Merge "audiopolicy: Update input device check in ch... | Eric Laurent | 2014-11-17 | 1 | -3/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "audiopolicy: Update input device check in checkInputsForDevice" into l... | Eric Laurent | 2014-11-17 | 1 | -3/+6 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | audiopolicy: Update input device check in checkInputsForDevice | Eric Laurent | 2014-11-17 | 1 | -3/+6 |
| | | |/ / / / | |||||
* | | | | | | | am f1b0c671: am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-a... | Elliott Hughes | 2014-11-17 | 1 | -7/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-master | Elliott Hughes | 2014-11-17 | 1 | -7/+0 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | libcutils no longer requires that its users configure ANDROID_SMP. | Elliott Hughes | 2014-11-17 | 1 | -7/+0 |
* | | | | | | | am bf1e36e8: am 771a362d: am 3171f4e1: Merge "CameraService: normalize face r... | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles pro... | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-dev | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | CameraService: normalize face rectangles properly | Chien-Yu Chen | 2014-11-13 | 3 | -73/+90 |
| * | | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp | Marco Nelissen | 2014-11-17 | 12 | -29/+29 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-17 | 12 | -29/+29 |
* | | | | | | | am 7aa310d9: am 0ef3210f: am 14a74010: Merge "Include AudioPolicyInterface.h ... | Chih-Hung Hsieh | 2014-11-15 | 2 | -0/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 0ef3210f: am 14a74010: Merge "Include AudioPolicyInterface.h only when nee... | Chih-Hung Hsieh | 2014-11-15 | 2 | -0/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Include AudioPolicyInterface.h only when needed. | Chih-Hung Hsieh | 2014-11-14 | 2 | -0/+3 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-14 | 12 | -29/+29 |
* | | | | | | Merge "Include normal output track buffer depth in systrace" | Glenn Kasten | 2014-11-14 | 1 | -0/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Include normal output track buffer depth in systrace | Glenn Kasten | 2014-11-10 | 1 | -0/+21 |
* | | | | | | | am 7deab61a: am 06ce4cf5: Merge "Camera2Device: fix camera metadata leaks" in... | Chien-Yu Chen | 2014-11-12 | 2 | -15/+5 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am 06ce4cf5: Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-de... | Chien-Yu Chen | 2014-11-12 | 2 | -15/+5 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-dev | Chien-Yu Chen | 2014-11-12 | 2 | -15/+5 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | Camera2Device: fix camera metadata leaks | Chien-Yu Chen | 2014-11-10 | 2 | -15/+5 |
* | | | | | | | am 9226e7c5: am 2f702c9b: am 43e10bb7: Merge "Move to libc++." | Dan Albert | 2014-11-11 | 1 | -14/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 2f702c9b: am 43e10bb7: Merge "Move to libc++." | Dan Albert | 2014-11-11 | 1 | -14/+3 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Move to libc++. | Dan Albert | 2014-11-11 | 1 | -14/+3 |
* | | | | | | | am 6e48af3d: am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder(... | Eino-Ville Talvala | 2014-11-11 | 6 | -16/+26 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | |