summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | If audio startup fails while executing MediaPlayer::start() do NOT post an errorAndreas Huber2011-07-142-5/+12
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Force bitmaps to load in ARGB8888 by default. Bug #5024993"Romain Guy2011-07-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Force bitmaps to load in ARGB8888 by default.Romain Guy2011-07-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Fix build.Wink Saville2011-07-141-0/+2
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Rationalize API after adding maximum size feature."Philip Milne2011-07-146-227/+262
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Rationalize API after adding maximum size feature.Philip Milne2011-07-136-227/+262
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Minor documentation updates for the AudioTrack class."Narayan Kamath2011-07-141-16/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Minor documentation updates for the AudioTrack class.Narayan Kamath2011-07-141-16/+32
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add MEDIA_UID"Glenn Kasten2011-07-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add MEDIA_UIDGlenn Kasten2011-07-131-0/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff w...Wink Saville2011-07-146-148/+291
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible....Wink Saville2011-07-136-148/+291
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeyc...Wink Saville2011-07-136-148/+291
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Remove STOPSHIP but allow seamless Handoff when possible.Wink Saville2011-07-136-148/+291
* | | | | | | | | | | | | | | | | | | | | | | | | am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-...Jaikumar Ganesh2011-07-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of ab3ec176 to honeycomb-plus-aospJaikumar Ganesh2011-07-133-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from canc...Jaikumar Ganesh2011-07-133-5/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"Jaikumar Ganesh2011-07-133-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Bluetooth: correcting return value from cancelDiscovery"Jaikumar Ganesh2011-07-133-5/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | Bluetooth: correcting return value from cancelDiscoveryAlbert Mojir2011-03-213-5/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into hone...John Wang2011-07-146-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTEJohn Wang2011-07-136-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add getImei() to Phone interface." into honeycomb-LTEJohn Wang2011-07-136-0/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Add getImei() to Phone interface.John Wang2011-07-116-0/+31
| | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve handling of low memory."Dianne Hackborn2011-07-148-342/+336
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Improve handling of low memory.Dianne Hackborn2011-07-148-342/+336
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Nicer API for disabling/enabling the home/up button in action bars.Adam Powell2011-07-144-38/+55
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove Car audio class from auto pairing."Jaikumar Ganesh2011-07-141-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove Car audio class from auto pairing.Jaikumar Ganesh2011-07-141-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Support profile and level query for SW video decoders"James Dong2011-07-145-5/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Support profile and level query for SW video decodersJames Dong2011-07-115-5/+130
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "unhide public apis"Jeff Hamilton2011-07-142-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | unhide public apisBen Dodson2011-07-132-4/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Include all supported mime types when querying decoder profile/level s...Andreas Huber2011-07-141-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Include all supported mime types when querying decoder profile/level support.Andreas Huber2011-07-131-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove legacy http support from stagefright, chromium is the new hotne...Andreas Huber2011-07-1411-1621/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove legacy http support from stagefright, chromium is the new hotness.Andreas Huber2011-07-1311-1621/+19
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Minor cleanups to TextToSpeech."Narayan Kamath2011-07-141-20/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor cleanups to TextToSpeech.Narayan Kamath2011-07-141-20/+25
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "OMX CallbackDispatcher uses C++ Thread not pthread"Glenn Kasten2011-07-142-28/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | OMX CallbackDispatcher uses C++ Thread not pthreadGlenn Kasten2011-07-122-28/+36
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Refactor input dispatcher use of window/app handles."Jeff Brown2011-07-1426-1045/+746
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor input dispatcher use of window/app handles.Jeff Brown2011-07-1426-1045/+746
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix invalid JNI call signature. Bug: 5029536"Jeff Brown2011-07-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid JNI call signature.Jeff Brown2011-07-141-1/+1
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | SearchBox API changes, to know when calls succeeded.Mathew Inwood2011-07-144-23/+96
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Provide more descriptive name for InputChannel ashmem.Jeff Brown2011-07-131-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in submenus opened from icon menusAdam Powell2011-07-131-2/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Preserve spacing for icons in menus"Adam Powell2011-07-135-7/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Preserve spacing for icons in menusAdam Powell2011-07-135-7/+67
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |