summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | am 7fcf81e3: am 745e7fd4: Fix stop supplicant apiIrfan Sheriff2012-11-082-2/+11
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 745e7fd4: Fix stop supplicant apiIrfan Sheriff2012-11-062-2/+11
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Fix stop supplicant apiIrfan Sheriff2012-11-062-2/+11
* | | | | | | am c8bc2286: am 7aab5b0f: Merge "Close a newly opened direct output if its pa...Jason Simmons2012-11-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7aab5b0f: Merge "Close a newly opened direct output if its parameters are ...Jason Simmons2012-11-081-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Close a newly opened direct output if its parameters are invalid" into...Jason Simmons2012-11-061-0/+1
| | |\ \ \ \ \
| | | * | | | | Close a newly opened direct output if its parameters are invalidJason Simmons2012-10-311-0/+1
* | | | | | | | am fd1523d7: (-s ours) am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factor...The Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-releas...The Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | | | | |
| | | | \ \
| | | *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | / | | | | | |/
* | | | | | am cc8fedd3: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-290-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | |\ \ \
* | | | | | | | | | audio policy: fix volume change when disabling SCOEric Laurent2012-10-301-1/+4
* | | | | | | | | | am 9405f9be: am 5debe925: Fix a parse error in checkOutputForDeviceJohn Grossman2012-10-301-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 5debe925: Fix a parse error in checkOutputForDeviceJohn Grossman2012-10-291-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Fix a parse error in checkOutputForDeviceJohn Grossman2012-10-291-2/+2
| | |/ / / / / / /
* | | | | | | | | am 92be42eb: am 5a484b75: audio policy: active analog dock force usageEric Laurent2012-10-301-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 5a484b75: audio policy: active analog dock force usageEric Laurent2012-10-291-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | audio policy: active analog dock force usageEric Laurent2012-10-261-1/+2
| | |/ / / / / /
* | | | | | | | am 6d4af736: am 06eda4e2: Merge "Fix native crash when driver commands time o...Irfan Sheriff2012-10-181-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 06eda4e2: Merge "Fix native crash when driver commands time out" into jb-m...Irfan Sheriff2012-10-181-1/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix native crash when driver commands time out" into jb-mr1-devIrfan Sheriff2012-10-181-1/+7
| | |\ \ \ \ \ \
| | | * | | | | | Fix native crash when driver commands time outIrfan Sheriff2012-10-181-1/+7
* | | | | | | | | am 79a4e2ef: am 89ef58f4: Merge "audio policy: fix scanning of supported devi...Eric Laurent2012-10-181-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 89ef58f4: Merge "audio policy: fix scanning of supported devices" into jb-...Eric Laurent2012-10-181-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "audio policy: fix scanning of supported devices" into jb-mr1-devEric Laurent2012-10-181-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | audio policy: fix scanning of supported devicesEric Laurent2012-10-171-2/+2
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | am d22bb8f4: am 672e9ace: Merge "audio policy: tune voice/video chat volumes"...Eric Laurent2012-10-182-18/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 672e9ace: Merge "audio policy: tune voice/video chat volumes" into jb-mr1-devEric Laurent2012-10-182-18/+22
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "audio policy: tune voice/video chat volumes" into jb-mr1-devEric Laurent2012-10-182-18/+22
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | audio policy: tune voice/video chat volumesEric Laurent2012-10-172-18/+22
| | | | |/ / / / | | | |/| | | |
* | | | | | | | am 8ec910e0: am 77268631: audio policy: update output delayMs in setPhoneStateSathishKumar Mani2012-10-171-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 77268631: audio policy: update output delayMs in setPhoneStateSathishKumar Mani2012-10-171-0/+16
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | audio policy: update output delayMs in setPhoneStateSathishKumar Mani2012-10-171-0/+16
| | |/ / / / /
* | | | | | | am d6745071: am aac67317: Merge "audio policy: do not route in call audio to ...Eric Laurent2012-10-161-20/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am aac67317: Merge "audio policy: do not route in call audio to HDMI" into jb...Eric Laurent2012-10-161-20/+24
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-devEric Laurent2012-10-161-20/+24
| | |\ \ \ \ \
| | | * | | | | audio policy: do not route in call audio to HDMIEric Laurent2012-10-161-20/+24
| | | |/ / / /
* | | | | | | am d4165152: am 85ad78f2: Initialize mStrategyMutedByDeviceMarco Nelissen2012-10-161-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 85ad78f2: Initialize mStrategyMutedByDeviceMarco Nelissen2012-10-161-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Initialize mStrategyMutedByDeviceMarco Nelissen2012-10-161-0/+3
| | | |/ / / | | |/| | |
* | | | | | am a1084207: am b707cf22: Merge "Remote audio submix always has priority for ...Jean-Michel Trivi2012-10-152-6/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b707cf22: Merge "Remote audio submix always has priority for media, only p...Jean-Michel Trivi2012-10-152-6/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Remote audio submix always has priority for media, only plays media" i...Jean-Michel Trivi2012-10-152-6/+5
| | |\ \ \ \ | | | |/ / / | | |/| | |