summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio/media: convert to using the audio HAL and new audio defsDima Zavin2011-04-2739-1157/+951
| | | | | Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5 Signed-off-by: Dima Zavin <dima@android.com>
* libmedia: move AudioParameter out of AudioSystemDima Zavin2011-04-275-198/+266
| | | | | Change-Id: I9eb7e002d141936258050d4fa4f0ccd8202bfc54 Signed-off-by: Dima Zavin <dima@android.com>
* audioflinger: move legacy audio hw/policy out to libhardware_legacyDima Zavin2011-04-2711-4813/+0
| | | | | Change-Id: I4adcec73d3c08bcbe15bb19e1ba2ff18b195af45 Signed-off-by: Dima Zavin <dima@android.com>
* Merge "Fix overlay action bar decor layout for lower context mode area."Adam Powell2011-04-261-1/+1
|\
| * Fix overlay action bar decor layout for lower context mode area.Adam Powell2011-04-261-1/+1
| | | | | | | | Change-Id: I36287c36ed36179eed2b742d494d18de87541001
* | am 3fa53e44: am 36e6c4c1: am cc9ee72b: Implement dead service recovery in ↵Nick Pelly2011-04-262-17/+42
|\ \ | | | | | | | | | | | | | | | | | | NFC extras library. * commit '3fa53e448a4b2255f6ed14f8b8355ac2ee3379e9': Implement dead service recovery in NFC extras library.
| * \ am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.Nick Pelly2011-04-262-17/+42
| |\ \ | | | | | | | | | | | | | | | | * commit '36e6c4c1940f816df6c7745458f8c6bcca643701': Implement dead service recovery in NFC extras library.
| | * \ am cc9ee72b: Implement dead service recovery in NFC extras library.Nick Pelly2011-04-262-17/+42
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2': Implement dead service recovery in NFC extras library.
| | | * | Implement dead service recovery in NFC extras library.Nick Pelly2011-04-262-17/+42
| | | | | | | | | | | | | | | | | | | | Change-Id: I4f1d714c625470df4cda2c4c9aacb8d27bfabb10
* | | | | Merge "Report errors when eglCreateImageKHR fails"Mathias Agopian2011-04-261-7/+8
|\ \ \ \ \
| * | | | | Report errors when eglCreateImageKHR failsMathias Agopian2011-04-261-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica39b72ac2505675e619ef4994bd67b98bf6e7da
* | | | | | Merge "- Add instrumentation utility to automate rs performance tests: The ↵Xia Wang2011-04-268-16/+238
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | RsBench test activity can be launched within instrumentation"
| * | | | | | - Add instrumentation utility to automate rs performance tests:Xia Wang2011-04-268-16/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RsBench test activity can be launched within instrumentation - Provide parameter to control test run: set the maximum number of loops from test runner, the script will send out a message after the test loops exceeds the maxium number Change-Id: I5fba0543094ef7a8b5eaa6ff9a04367d272b4d65
* | | | | | | Merge "Import revised translations."Eric Fischer2011-04-2640-161/+81
|\ \ \ \ \ \ \
| * | | | | | | Import revised translations.Eric Fischer2011-04-2640-161/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec08aa2073bf29bbc9465e57228f6776d3b49ad0
* | | | | | | | am ca15bf7a: am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc ↵Conley Owens2011-04-261-0/+44
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration value from SIM (KDDI-CDMA)" * commit 'ca15bf7ae0e55057d3eafabe5f97fe81bb3dcf26': Load mnc/mcc configuration value from SIM (KDDI-CDMA)
| * | | | | | | am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration ↵Conley Owens2011-04-261-0/+44
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | value from SIM (KDDI-CDMA)" * commit '54a952c84317afc64034ded8baad3d788a54026d': Load mnc/mcc configuration value from SIM (KDDI-CDMA)
| | * | | | | | am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM ↵Conley Owens2011-04-261-0/+44
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (KDDI-CDMA)" * commit 'bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5': Load mnc/mcc configuration value from SIM (KDDI-CDMA)
| | | * \ \ \ \ \ am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"Conley Owens2011-04-261-0/+44
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17ba30b549a847f3aab854173a9484851f694453': Load mnc/mcc configuration value from SIM (KDDI-CDMA)
| | | | * \ \ \ \ \ Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"Conley Owens2011-04-261-0/+44
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Load mnc/mcc configuration value from SIM (KDDI-CDMA)Masanori Ogino2011-04-121-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now support to load mnc/mcc value from IMSI on KDDI-CDMA. Change-Id: I6f1d137ecf2e3130ca8f1a782dccec13b51f9933
* | | | | | | | | | | Merge "Apply shaders/filters to text drop shadows. Bug #4318323"Romain Guy2011-04-264-12/+33
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Apply shaders/filters to text drop shadows.Romain Guy2011-04-264-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #4318323 This change also fixes the fact that shaders were not modulated by the paint's color when drawing paths. Change-Id: Id88804143aea06c895d4cbcdbe106d660230aa5a
* | | | | | | | | | | Merge "Update shader text to test with drop shadows."Romain Guy2011-04-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Update shader text to test with drop shadows.Romain Guy2011-04-261-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefdf116846c9b5649d1561a9d80d66d1c3acfeca
* | | | | | | | | | Merge "Start ICS header cleanup and finish type matrix."Stephen Hines2011-04-2617-0/+253
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Start ICS header cleanup and finish type matrix.Jason Sams2011-04-2517-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If65f96f08c958d330862c543d85dd9d4a0f90e06
* | | | | | | | | | | am fbb0e9f9: am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an ↵Kenny Root2011-04-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improper const-cast in RefBase" * commit 'fbb0e9f9846e185ba8ded63d754c4e61b1499b90': libutils: Fix an improper const-cast in RefBase
| * | | | | | | | | | am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper ↵Kenny Root2011-04-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | const-cast in RefBase" * commit 'bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930': libutils: Fix an improper const-cast in RefBase
| | * | | | | | | | | am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in ↵Kenny Root2011-04-261-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RefBase" * commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071': libutils: Fix an improper const-cast in RefBase
| | | * | | | | | | | am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"Kenny Root2011-04-261-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13ce221e4316f7956ba072e774a7b97646e5d99b': libutils: Fix an improper const-cast in RefBase
| | | | * | | | | | | Merge "libutils: Fix an improper const-cast in RefBase"Kenny Root2011-04-261-1/+1
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | libutils: Fix an improper const-cast in RefBaseJosh Stone2011-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under Fedora 15 Beta, gcc 4.6.0 warns: frameworks/base/libs/utils/RefBase.cpp: In member function ‘void android::RefBase::weakref_type::trackMe(bool, bool)’: frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing ‘const android::RefBase::weakref_impl’ as ‘this’ argument of ‘void android::RefBase::weakref_impl::trackMe(bool, bool)’ discards qualifiers [-fpermissive] trackMe is not a const function, so don't use const in the static_cast to a weakref_impl pointer. Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
* | | | | | | | | | | | am 31418a1e: am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning ↵Jean-Baptiste Queru2011-04-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | local variable if mStringBlocks was initialized here. NPE is thrown otherwise." * commit '31418a1e9b905593587d8bf7a4705429db549d97': Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
| * | | | | | | | | | | am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable ↵Jean-Baptiste Queru2011-04-261-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if mStringBlocks was initialized here. NPE is thrown otherwise." * commit '45e13ec1c5cd765162b7450b1c3a4632e8979894': Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
| | * | | | | | | | | | am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if ↵Jean-Baptiste Queru2011-04-261-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mStringBlocks was initialized here. NPE is thrown otherwise." * commit '5fcfce965f1380ee7e151c1df75b247dd42b349e': Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
| | | * | | | | | | | | am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was ↵Jean-Baptiste Queru2011-04-261-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized here. NPE is thrown otherwise." * commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765': Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
| | | | * | | | | | | | Merge "Re-assingning local variable if mStringBlocks was initialized here. ↵Jean-Baptiste Queru2011-04-251-0/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | NPE is thrown otherwise."
| | | | | * | | | | | | Re-assingning local variable if mStringBlocks was initialized here. NPE is ↵Jozef BABJAK2011-04-191-0/+1
| | | | | | |_|/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thrown otherwise. Change-Id: Ic8648aa5ae6a61348803171243c1c217feb058ec
* | | | | | | | | | | am 4e1027e4: am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and ↵Irfan Sheriff2011-04-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wakeup in framework * commit '4e1027e45dbe292b1bdcbd3500b20f00618303f4': Handle DHCP renewal and wakeup in framework
| * | | | | | | | | | am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in frameworkIrfan Sheriff2011-04-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9': Handle DHCP renewal and wakeup in framework
| | * | | | | | | | | am d2127c43: Handle DHCP renewal and wakeup in frameworkIrfan Sheriff2011-04-261-31/+122
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | | * commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78': Handle DHCP renewal and wakeup in framework
| | | * | | | | | | Handle DHCP renewal and wakeup in frameworkIrfan Sheriff2011-04-221-31/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native DHCP client renews IP address, but can fail to do so when the device is in suspend. This has lead to issues where device fails to renew in time and on networks with lots of devices re-using expired DHCP IP addresses, it leads to severe issues. Handle DHCP renewal and wakeup in framework Bug: 3344732 Change-Id: Ie4062e04a477f4a233946155e40a7c999b337c3f
* | | | | | | | | | am 1786fdda: am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple ↵Scott Main2011-04-261-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usb driver URLs bug: 4339758 * commit '1786fddabeeffcceede702005839d9544188bc33': docs: update a couple usb driver URLs bug: 4339758
| * | | | | | | | | am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs ↵Scott Main2011-04-261-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 4339758 * commit 'e20c91de9ccb4a8cb76a8e72884f2e9ca001a2de': docs: update a couple usb driver URLs bug: 4339758
| | * \ \ \ \ \ \ \ \ am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758Scott Main2011-04-261-3/+3
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1e3d7d97caf89307230e85997f5d23074b216cb': docs: update a couple usb driver URLs bug: 4339758
| | | * \ \ \ \ \ \ \ \ am 97fee855: docs: update a couple usb driver URLs bug: 4339758Scott Main2011-04-261-3/+3
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97fee8554d40a8c093ef16934284d9292e4cf7a4': docs: update a couple usb driver URLs bug: 4339758
| | | | * | | | | | | | | docs: update a couple usb driver URLsScott Main2011-04-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 4339758 Change-Id: I39357a0061312b189f50c296105cefe3862fc733
* | | | | | | | | | | | | am 48dca4de: am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volumeEric Laurent2011-04-261-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | * commit '48dca4de70890d324b5830a58bb9fa273164151a': Fix issue 4335692: HDMI media volume
| * | | | | | | | | | | am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volumeEric Laurent2011-04-261-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26': Fix issue 4335692: HDMI media volume