OSDN Git Service
Romain Guy [Fri, 17 Feb 2012 23:18:14 +0000 (15:18 -0800)]
Merge "Record possible clip rejects when recording display lists"
Siva Velusamy [Fri, 17 Feb 2012 23:05:36 +0000 (15:05 -0800)]
Merge "gltrace: Trace thread time and wall clock time."
Iliyan Malchev [Fri, 17 Feb 2012 22:51:32 +0000 (14:51 -0800)]
Merge "libs/utils: replace malloc() + memset() to zero with calloc()"
Mike Lockwood [Fri, 17 Feb 2012 22:33:27 +0000 (14:33 -0800)]
Merge "Revert "Revert "The com.android.athome api classes are moving android.support.place."""
Iliyan Malchev [Fri, 17 Feb 2012 22:28:38 +0000 (14:28 -0800)]
Merge "bluetooth: replace malloc() + memset() to zero with calloc()"
Iliyan Malchev [Fri, 17 Feb 2012 20:15:58 +0000 (12:15 -0800)]
libs/utils: replace malloc() + memset() to zero with calloc()
Change-Id: I8bdf4360147e51e35c162856c9a859aed6acac34
Signed-off-by: Iliyan Malchev <malchev@google.com>
Romain Guy [Fri, 17 Feb 2012 21:09:19 +0000 (13:09 -0800)]
Merge "Remove unused private APIs"
Eric Fischer [Fri, 17 Feb 2012 20:18:44 +0000 (12:18 -0800)]
Merge "Import translations."
Jason Sams [Fri, 17 Feb 2012 20:05:13 +0000 (12:05 -0800)]
Merge "Update prototype remote fifo. Tested primary connection using only fifo data transport."
Jason Sams [Fri, 17 Feb 2012 20:04:20 +0000 (12:04 -0800)]
Merge "Rename three header files to free namespace for api."
Siva Velusamy [Fri, 17 Feb 2012 18:55:03 +0000 (10:55 -0800)]
gltrace: Trace thread time and wall clock time.
For each gl function, trace both the thread and wall clock
times.
Change-Id: I32b6caa67fa50bf915dab89b3c5021ee82e28d55
Glenn Kasten [Fri, 17 Feb 2012 18:45:02 +0000 (10:45 -0800)]
Merge "Remove bit fields to improve performance"
Jeff Brown [Fri, 17 Feb 2012 18:30:50 +0000 (10:30 -0800)]
Merge "Ignore broken input channel when finishing input event."
Philip Milne [Fri, 17 Feb 2012 18:06:47 +0000 (10:06 -0800)]
Merge "Fix remaining issue with bug #
5904777"
Mike Lockwood [Fri, 17 Feb 2012 17:53:30 +0000 (09:53 -0800)]
Merge "Revert "The com.android.athome api classes are moving android.support.place.""
Mike Lockwood [Fri, 17 Feb 2012 17:47:47 +0000 (09:47 -0800)]
Merge "New clock sync control loop."
Glenn Kasten [Fri, 17 Feb 2012 17:40:43 +0000 (09:40 -0800)]
Merge "Simplify code"
Mike Lockwood [Fri, 17 Feb 2012 17:20:43 +0000 (09:20 -0800)]
Merge "Put a bandaid on a segfault in timed audio track handling."
Mike Lockwood [Fri, 17 Feb 2012 17:20:12 +0000 (09:20 -0800)]
Merge "The com.android.athome api classes are moving android.support.place."
Glenn Kasten [Fri, 17 Feb 2012 17:19:49 +0000 (09:19 -0800)]
Merge "Fixed possible heap corruption in EffectDesc"
Eric Fischer [Fri, 17 Feb 2012 05:10:27 +0000 (21:10 -0800)]
Merge "Import translations."
Jeff Brown [Fri, 17 Feb 2012 04:31:29 +0000 (20:31 -0800)]
Merge "Don't throw on EPIPE in consumeBatchedInputEvents."
Christian Robertson [Fri, 17 Feb 2012 03:59:08 +0000 (19:59 -0800)]
Merge "Update DroidNaskh font"
Jeff Brown [Fri, 17 Feb 2012 03:49:14 +0000 (19:49 -0800)]
Merge "Mark input and sensor messages as asynchronous."
Jeff Brown [Fri, 17 Feb 2012 03:49:03 +0000 (19:49 -0800)]
Merge "Improve MessageQueue sync barrier implementation."
Jeff Brown [Fri, 17 Feb 2012 03:43:43 +0000 (19:43 -0800)]
Merge "Encapsulate the ViewRootImpl's handler."
Bart Sears [Fri, 17 Feb 2012 02:01:38 +0000 (18:01 -0800)]
Merge "New version of DroidSansFallback"
Dianne Hackborn [Fri, 17 Feb 2012 02:01:31 +0000 (18:01 -0800)]
Merge "Revert "Don't wait for current activity to pause before resuming next.""
Fabrice Di Meglio [Fri, 17 Feb 2012 00:58:47 +0000 (16:58 -0800)]
Merge "Improve textDirection APIs"
Romain Guy [Fri, 17 Feb 2012 00:52:53 +0000 (16:52 -0800)]
Merge "Ensure we always reset graphics modifiers Bug #
6025838"
Fabrice Di Meglio [Thu, 16 Feb 2012 23:50:39 +0000 (15:50 -0800)]
Merge "Fix Javadoc for View"
Amith Yamasani [Thu, 16 Feb 2012 23:48:14 +0000 (15:48 -0800)]
Merge "Fix Power Control widget"
John Grossman [Thu, 16 Feb 2012 23:28:44 +0000 (15:28 -0800)]
Merge "Really fix the build this time."
Selim Gurun [Thu, 16 Feb 2012 23:13:12 +0000 (15:13 -0800)]
Merge "Act on credential storage updates."
John Grossman [Thu, 16 Feb 2012 22:57:54 +0000 (14:57 -0800)]
Merge "Fix the build."
Dianne Hackborn [Thu, 16 Feb 2012 22:48:53 +0000 (14:48 -0800)]
am
e669d666: am
1db7eeac: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
e669d6666ae0c41742716bc2564266c1bab3f855':
Dianne Hackborn [Thu, 16 Feb 2012 22:48:48 +0000 (14:48 -0800)]
am
804aa297: am
01810bbb: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
804aa297950949985882e4841303cd6e12fae06e':
Fix last change -- don't call startInputInner() with lock held.
Dianne Hackborn [Thu, 16 Feb 2012 22:46:41 +0000 (14:46 -0800)]
am
1db7eeac: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
1db7eeac74d1455991e1dc0f532b47276d0c679c':
Dianne Hackborn [Thu, 16 Feb 2012 22:45:57 +0000 (14:45 -0800)]
am
01810bbb: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
01810bbb67b7af741b0dde0d7ccdadb76a46ed63':
Fix last change -- don't call startInputInner() with lock held.
Dianne Hackborn [Thu, 16 Feb 2012 22:44:03 +0000 (14:44 -0800)]
am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
06a591cdd6d90600db006906d5d1524d156d6529':
Fix last change -- don't call startInputInner() with lock held.
Dianne Hackborn [Thu, 16 Feb 2012 22:43:43 +0000 (14:43 -0800)]
am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
06a591cdd6d90600db006906d5d1524d156d6529':
Fix last change -- don't call startInputInner() with lock held.
Fabrice Di Meglio [Thu, 16 Feb 2012 22:36:28 +0000 (14:36 -0800)]
Merge "Add View.onResolvePadding() as a public API"
Svetoslav Ganov [Thu, 16 Feb 2012 22:18:46 +0000 (14:18 -0800)]
Merge "Fixing the build."
Svetoslav Ganov [Thu, 16 Feb 2012 21:06:29 +0000 (13:06 -0800)]
Merge "Adding shell commands for modifying content."
The Android Open Source Project [Thu, 16 Feb 2012 19:25:37 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:16 +0000 (11:25 -0800)]
Justin Ho [Thu, 16 Feb 2012 19:25:01 +0000 (11:25 -0800)]
am
f581e486: am
eefef982: am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
f581e4868b3443c6ee9a463a879ed398fb3648c9':
Justin Ho [Thu, 16 Feb 2012 19:24:59 +0000 (11:24 -0800)]
am
8ff0c4cb: am
727ba648: am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
8ff0c4cb320110e4f2d682ef352ef3eb6e0296c8':
Justin Ho [Thu, 16 Feb 2012 19:24:57 +0000 (11:24 -0800)]
am
c3132a0b: am
ac18f89c: am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
c3132a0b1ec23956ada3def4d5702f6149c68336':
Update WiMAX notification icons Bug:
5724605
Eric Laurent [Thu, 16 Feb 2012 18:30:51 +0000 (10:30 -0800)]
Merge "Fix music volume regression on tablets"
Mike Lockwood [Thu, 16 Feb 2012 18:15:32 +0000 (10:15 -0800)]
Merge "WifiStateTracker: add support for overriding DCHP max retry count in an overlay"
Mike Lockwood [Thu, 16 Feb 2012 18:15:16 +0000 (10:15 -0800)]
Merge "Remove airplane mode related wifi test for Wi-Fi only devices."
The Android Open Source Project [Thu, 16 Feb 2012 18:13:52 +0000 (10:13 -0800)]
am
e113e793: Reconcile with ics-mr1-release
* commit '
e113e793b32ca4c7fe41de41c40a34c494b4c783':
The Android Open Source Project [Thu, 16 Feb 2012 18:10:13 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
The Android Open Source Project [Thu, 16 Feb 2012 18:04:19 +0000 (10:04 -0800)]
am
9777fb10: Reconcile with ics-mr1-release
* commit '
9777fb106f3705e2a9610c4f9020d7f68941d83c':
The Android Open Source Project [Thu, 16 Feb 2012 18:02:15 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
Justin Ho [Thu, 16 Feb 2012 17:44:03 +0000 (09:44 -0800)]
am
eefef982: am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
eefef98226682a1a6f4458c955b611c69b11068e':
Justin Ho [Thu, 16 Feb 2012 17:43:57 +0000 (09:43 -0800)]
am
727ba648: am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
727ba648d66bbeeb003803afcb380cf91bcd9966':
The Android Automerger [Thu, 16 Feb 2012 17:40:11 +0000 (09:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:31:31 +0000 (09:31 -0800)]
am
ac18f89c: am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
ac18f89cf5ac8a2a63223c28139f6697d974e533':
Update WiMAX notification icons Bug:
5724605
Justin Ho [Thu, 16 Feb 2012 17:29:53 +0000 (09:29 -0800)]
am
09170888: am
cc1bd4bb: am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
09170888cbc501cd9819b1caccc99592bc6dd73f':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:29:07 +0000 (09:29 -0800)]
am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
e8e0527aa699c7db999b659b044d16cea6c67901':
Update WiMAX notification icons Bug:
5724605
Alex Sakhartchouk [Thu, 16 Feb 2012 17:28:21 +0000 (09:28 -0800)]
Merge "Piping texture names through shader builder. Fixing uint size_t mismatch."
Justin Ho [Thu, 16 Feb 2012 17:28:12 +0000 (09:28 -0800)]
am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
e8e0527aa699c7db999b659b044d16cea6c67901':
Update WiMAX notification icons Bug:
5724605
Justin Ho [Thu, 16 Feb 2012 17:27:16 +0000 (09:27 -0800)]
am
cc1bd4bb: am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
cc1bd4bbbc7314ab7d3ba015c16ea78cbfd6459f':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:27:05 +0000 (09:27 -0800)]
Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:25:03 +0000 (09:25 -0800)]
am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:24:42 +0000 (09:24 -0800)]
am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:23:01 +0000 (09:23 -0800)]
Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
Scott Main [Thu, 16 Feb 2012 15:34:11 +0000 (07:34 -0800)]
am
22182aa3: am
9fc057aa: am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to t
* commit '
22182aa3f7bc41c401bcb63fe6c86b735573cc07':
Scott Main [Thu, 16 Feb 2012 15:34:09 +0000 (07:34 -0800)]
am
f72a0e71: am
27790d98: am
26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '
f72a0e71b9793c41aca2bf20306b3c71c0570eab':
Robert Greenwalt [Thu, 16 Feb 2012 15:34:07 +0000 (07:34 -0800)]
am
70c10e20: am
3fd0ed8d: am
c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
* commit '
70c10e2059e5bb8d882cda7cf1691793d83789ca':
Robert Greenwalt [Thu, 16 Feb 2012 15:34:05 +0000 (07:34 -0800)]
am
23f278fc: am
84d8eed0: am
fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit '
23f278fc96bdab8bab606a47706132a31985c202':
Justin Ho [Thu, 16 Feb 2012 15:34:03 +0000 (07:34 -0800)]
am
a7112d0e: am
8a3bf559: am
c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug:
5724605" into ics-mr1
* commit '
a7112d0efebb50c373464d9ac96340997d5e9cdb':
Michael Jurka [Thu, 16 Feb 2012 08:10:10 +0000 (00:10 -0800)]
Merge "Minor public.xml cleanup"
Stephen Hines [Thu, 16 Feb 2012 07:05:18 +0000 (23:05 -0800)]
Merge "Vectors of non-primitive types are not allowed."
Selim Gurun [Thu, 16 Feb 2012 03:04:58 +0000 (19:04 -0800)]
Merge "Revert "Act on credential storage updates.""
Romain Guy [Thu, 16 Feb 2012 02:36:55 +0000 (18:36 -0800)]
Merge "Prevent AutoCompleteTextView from opening a popup when it shouldn't Bug #
5553515"
Scott Main [Thu, 16 Feb 2012 02:36:00 +0000 (18:36 -0800)]
am
9fc057aa: am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device set
* commit '
9fc057aab4f08e5a40de665549f48bece0c7bd63':
Scott Main [Thu, 16 Feb 2012 02:35:56 +0000 (18:35 -0800)]
am
27790d98: am
26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '
27790d98d7c1f1804fda431bea1004c0e385da7a':
Robert Greenwalt [Thu, 16 Feb 2012 02:35:41 +0000 (18:35 -0800)]
am
3fd0ed8d: am
c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
* commit '
3fd0ed8d84e6901ddd50fbf0012496bda235e552':
Robert Greenwalt [Thu, 16 Feb 2012 02:35:39 +0000 (18:35 -0800)]
am
84d8eed0: am
fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit '
84d8eed0d27bae6e6a99a0e73ff71af80edae4d8':
Justin Ho [Thu, 16 Feb 2012 02:35:36 +0000 (18:35 -0800)]
am
8a3bf559: am
c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug:
5724605" into ics-mr1
* commit '
8a3bf55942f3a6c6a20bd8be03c142ef986600b5':
John Reck [Thu, 16 Feb 2012 02:04:16 +0000 (18:04 -0800)]
Merge "Initial support for keyboard navigation"
Selim Gurun [Thu, 16 Feb 2012 01:48:12 +0000 (17:48 -0800)]
Merge "Act on credential storage updates."
Scott Main [Thu, 16 Feb 2012 01:39:46 +0000 (17:39 -0800)]
am
3b3a5b52: am
09af1ade: am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to t
* commit '
3b3a5b52a7f586f02daba75c5ad982265b72411c':
docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
Scott Main [Thu, 16 Feb 2012 01:36:54 +0000 (17:36 -0800)]
am
09af1ade: am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device set
* commit '
09af1aded6dacf35cf54597cd81a636337bd9c9c':
docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
Scott Main [Thu, 16 Feb 2012 01:34:09 +0000 (17:34 -0800)]
am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also;
* commit '
2a1d19174e32bb6056086ec603948cd476a2ea67':
docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
Scott Main [Thu, 16 Feb 2012 01:33:15 +0000 (17:33 -0800)]
am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also;
* commit '
2a1d19174e32bb6056086ec603948cd476a2ea67':
docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
Scott Main [Thu, 16 Feb 2012 01:31:54 +0000 (17:31 -0800)]
Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1
Romain Guy [Thu, 16 Feb 2012 00:41:29 +0000 (16:41 -0800)]
Merge "Add a compile time condition to remove unnecessary code"
Kenny Root [Wed, 15 Feb 2012 23:04:01 +0000 (15:04 -0800)]
Move keystore to system/security repo
Move keystore to system/security at revision
a91203b08350b2fc7efda5b1eab39e7541476b3a
Change-Id: I7dbd625b864e9c63489b08e9fd28dfb22da81072
Jeff Brown [Wed, 15 Feb 2012 23:44:14 +0000 (15:44 -0800)]
Merge "Keep the display event receiver around forever."
Jeff Brown [Wed, 15 Feb 2012 23:37:49 +0000 (15:37 -0800)]
Merge "Simplify Choreographer API."
Fabrice Di Meglio [Wed, 15 Feb 2012 23:37:21 +0000 (15:37 -0800)]
Merge "Fix the build"
Stephen Hines [Wed, 15 Feb 2012 23:21:01 +0000 (15:21 -0800)]
Merge "Update Element.isCompatible() to work with NONE."
Alex Sakhartchouk [Wed, 15 Feb 2012 23:14:21 +0000 (15:14 -0800)]
Merge "Fixing uint32 size_t mismatches."
Scott Main [Wed, 15 Feb 2012 22:24:07 +0000 (14:24 -0800)]
am
deb92c61: am
fc28fbd4: am
26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '
deb92c612bc4b91be8f85da06c618c64b1cd20a8':
docs: Google+ badge now sizes properly; remove reposition hack
Jesse Wilson [Wed, 15 Feb 2012 22:17:55 +0000 (14:17 -0800)]
Merge "Implement the (hidden) ExtendedResponseCache interface."
Fabrice Di Meglio [Wed, 15 Feb 2012 21:59:27 +0000 (13:59 -0800)]
Merge "Make View paddingStart and paddingEnd API public"