OSDN Git Service
Stephen Hines [Wed, 29 Feb 2012 05:01:36 +0000 (21:01 -0800)]
Merge "Add test for signed/unsigned char bug (conversion)."
James Dong [Wed, 29 Feb 2012 02:49:34 +0000 (18:49 -0800)]
Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."
Gilles Debunne [Wed, 29 Feb 2012 02:05:28 +0000 (18:05 -0800)]
Merge "InputConnection is warned when finished"
satok [Wed, 29 Feb 2012 01:56:43 +0000 (17:56 -0800)]
Merge "Unblock IPC call in TextServicesManagerService"
Bart Sears [Wed, 29 Feb 2012 01:30:29 +0000 (17:30 -0800)]
Merge "Update AndroidEmoji to version 1.01"
Robert Ly [Tue, 28 Feb 2012 23:48:12 +0000 (15:48 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:45:40 +0000 (15:45 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:43:52 +0000 (15:43 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:42:32 +0000 (15:42 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:39:55 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:39:39 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:37:21 +0000 (15:37 -0800)]
Merge "fix bug
5911175" into ics-mr1
Gilles Debunne [Tue, 28 Feb 2012 23:32:04 +0000 (15:32 -0800)]
Merge "Removed TextAlign in TextView"
Dianne Hackborn [Tue, 28 Feb 2012 23:19:19 +0000 (15:19 -0800)]
am
11f343c6: am
c221d6ec: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
11f343c6b1b6a420c0a375edbb7c35d2fdb32482':
Dianne Hackborn [Tue, 28 Feb 2012 23:16:20 +0000 (15:16 -0800)]
am
c221d6ec: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
c221d6ec2fbaa73f82cd219e2d5ab078697070ab':
Jeff Sharkey [Tue, 28 Feb 2012 23:14:19 +0000 (15:14 -0800)]
Merge "Disable verbose NetworkStats logging."
Dianne Hackborn [Tue, 28 Feb 2012 23:10:39 +0000 (15:10 -0800)]
am
4953ec1c: am
a2e0e3b5: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
4953ec1c71c4c2c134da2c969945c0d8b4fcb03c':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:07:43 +0000 (15:07 -0800)]
am
a2e0e3b5: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:28 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:18 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:01:04 +0000 (15:01 -0800)]
Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
felipeal [Tue, 28 Feb 2012 22:59:29 +0000 (14:59 -0800)]
am
635d492d: (-s ours) am
4bcc9108: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
635d492d5918fe11a3a9bb9d9a87839a8331d34b':
felipeal [Tue, 28 Feb 2012 22:59:26 +0000 (14:59 -0800)]
am
96236bc8: (-s ours) am
fa73815e: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
96236bc8d93efc0573a18b87699d56a3ed8c0b0b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
Jean-Baptiste Queru [Tue, 28 Feb 2012 22:59:18 +0000 (14:59 -0800)]
am
ccd08b8d: am
e939edb5: am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
ccd08b8de9dc4c9cfaee93cbbcc7053cc9e8d96f':
Fixes update of extras Bundle in new Locations for GPS Provider
Michael Jurka [Tue, 28 Feb 2012 22:40:33 +0000 (14:40 -0800)]
Merge "Add shortcut for voice search"
James Dong [Tue, 28 Feb 2012 22:34:02 +0000 (14:34 -0800)]
Merge "Fix API issues in DrmRights class."
James Dong [Tue, 28 Feb 2012 22:33:19 +0000 (14:33 -0800)]
Merge "Deprecate default constructor for classes that should have been meant to be interfaces"
felipeal [Tue, 28 Feb 2012 22:09:43 +0000 (14:09 -0800)]
am
4bcc9108: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
4bcc910817c694c8d8b20e39a5ff42c584af1d49':
felipeal [Tue, 28 Feb 2012 22:07:26 +0000 (14:07 -0800)]
am
fa73815e: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
fa73815e1d953e67c635877440e717dc84465d97':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
felipeal [Tue, 28 Feb 2012 22:05:23 +0000 (14:05 -0800)]
am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
felipeal [Tue, 28 Feb 2012 22:04:20 +0000 (14:04 -0800)]
am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
Eric Fischer [Tue, 28 Feb 2012 21:56:29 +0000 (13:56 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 28 Feb 2012 21:55:24 +0000 (13:55 -0800)]
Merge "Import translations. DO NOT MERGE"
Jean-Baptiste Queru [Tue, 28 Feb 2012 21:53:17 +0000 (13:53 -0800)]
am
e939edb5: am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
e939edb5b4e991998ae8219b03d75c10cdc765cb':
Fixes update of extras Bundle in new Locations for GPS Provider
Jean-Baptiste Queru [Tue, 28 Feb 2012 21:33:44 +0000 (13:33 -0800)]
am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
f418738c64413b818e2dc507c912c2678876632f':
Fixes update of extras Bundle in new Locations for GPS Provider
Jean-Baptiste Queru [Tue, 28 Feb 2012 21:30:39 +0000 (13:30 -0800)]
am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
d7fa7deef9bc0cf22bf450fdb062327697c087c4':
Fixes update of extras Bundle in new Locations for GPS Provider
Jeff Sharkey [Tue, 28 Feb 2012 21:21:04 +0000 (13:21 -0800)]
Merge "Suppress StrictMode in handleBindApplication()."
James Dong [Tue, 28 Feb 2012 21:09:44 +0000 (13:09 -0800)]
Merge "Remove unnecessary header file includes for drmserver"
James Dong [Tue, 28 Feb 2012 21:09:24 +0000 (13:09 -0800)]
Merge "Added missing javadoc comment for public API in DrmUtils class"
Jason Noguchi [Tue, 28 Feb 2012 19:57:39 +0000 (11:57 -0800)]
am
bb189574: am
eac4b187: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
bb189574614d1ce8f9d61e58b7aebbd18f0d6c25':
Jason Noguchi [Tue, 28 Feb 2012 19:55:13 +0000 (11:55 -0800)]
am
a1de5e48: am
743aceec: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:53:49 +0000 (11:53 -0800)]
am
eac4b187: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
eac4b187d357eac61475c4dc6f673656e08e75a9':
Jason Noguchi [Tue, 28 Feb 2012 19:52:56 +0000 (11:52 -0800)]
am
743aceec: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
743aceec4289508a8c514dae7319659cf7f278c4':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:50:14 +0000 (11:50 -0800)]
am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:49:30 +0000 (11:49 -0800)]
am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:47:46 +0000 (11:47 -0800)]
Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
John Reck [Tue, 28 Feb 2012 19:40:00 +0000 (11:40 -0800)]
Merge "Fix cursorRingBounds NPE"
John Reck [Tue, 28 Feb 2012 19:38:56 +0000 (11:38 -0800)]
Merge "Fix NPE"
Dianne Hackborn [Tue, 28 Feb 2012 19:26:02 +0000 (11:26 -0800)]
Merge "You could think of this as what an OEM might do."
James Dong [Tue, 28 Feb 2012 19:23:26 +0000 (11:23 -0800)]
Merge "Deprecated a mis-spelled method and replaced it with a new method"
Android Git Automerger [Tue, 28 Feb 2012 18:51:35 +0000 (10:51 -0800)]
am
a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
Svetoslav Ganov [Tue, 28 Feb 2012 18:51:32 +0000 (10:51 -0800)]
am
8f4582a2: am
c78f1217: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
8f4582a278d3f93450f2a72ad6f6dc872668efb9':
Android Git Automerger [Tue, 28 Feb 2012 18:49:07 +0000 (10:49 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Svetoslav Ganov [Tue, 28 Feb 2012 18:41:42 +0000 (10:41 -0800)]
am
0c96daa5: am
0c7ffac4: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
0c96daa5d5a1ef778ad1ef4619ef1fa4c30519c6':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:39:17 +0000 (10:39 -0800)]
am
c78f1217: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
c78f121716ff7d4cbf8a70519a266ae030942751':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:38:39 +0000 (10:38 -0800)]
am
0c7ffac4: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:35:43 +0000 (10:35 -0800)]
am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:35:18 +0000 (10:35 -0800)]
am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
Jean-Baptiste Queru [Tue, 28 Feb 2012 15:28:51 +0000 (07:28 -0800)]
Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
Glenn Kasten [Tue, 28 Feb 2012 15:23:42 +0000 (07:23 -0800)]
Merge "Unlock effect chains in the middle of two if's"
Glenn Kasten [Tue, 28 Feb 2012 15:21:51 +0000 (07:21 -0800)]
Merge "Simplify removeNotificationClient"
Glenn Kasten [Tue, 28 Feb 2012 15:21:09 +0000 (07:21 -0800)]
Merge "AudioFlinger const methods and parameters"
Jean-Baptiste Queru [Tue, 28 Feb 2012 15:19:40 +0000 (07:19 -0800)]
am
254cf597: am
7b6b81f8: am
f016dc1b: am
f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '
254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
stagefright amr: Avoid C++/C99 for loops with variable declaration
Jean-Baptiste Queru [Tue, 28 Feb 2012 15:19:36 +0000 (07:19 -0800)]
am
d107453d: (-s ours) am
84dd87d9: am
015a248e: am
93df415c: Merge "Add stubs for better compatibility"
* commit '
d107453ddf3af507e015ac641d5fb67ed513cd4b':
Add stubs for better compatibility
Glenn Kasten [Tue, 28 Feb 2012 15:18:27 +0000 (07:18 -0800)]
Merge "Fix theoretical race condition in addOutputTrack"
Glenn Kasten [Tue, 28 Feb 2012 15:17:47 +0000 (07:17 -0800)]
Merge "AudioBufferProvider comments and cleanup"
Mathias Agopian [Tue, 28 Feb 2012 03:48:36 +0000 (19:48 -0800)]
Merge "a window could get stuck to gpu composition"
Mathias Agopian [Tue, 28 Feb 2012 03:48:21 +0000 (19:48 -0800)]
Merge "move CursorWindow from libbinder to libandroidfw"
Mathias Agopian [Tue, 28 Feb 2012 02:11:20 +0000 (18:11 -0800)]
move CursorWindow from libbinder to libandroidfw
Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
Jeff Sharkey [Tue, 28 Feb 2012 02:09:29 +0000 (18:09 -0800)]
Merge "Move NetworkStatsFactory to faster ProcFileReader."
Jamie Gennis [Tue, 28 Feb 2012 02:06:39 +0000 (18:06 -0800)]
Merge "Add tracing to various graphics components."
Jamie Gennis [Fri, 24 Feb 2012 03:27:23 +0000 (19:27 -0800)]
Add tracing to various graphics components.
This change adds ATRACE call tracing to BufferQueue,
SurfaceTextureClient, SurfaceTexture, SurfaceFlinger, Layer, and EGL.
Change-Id: I9d75ed26f5a3f0d1af635da38289520134cfbbb7
Jeff Sharkey [Tue, 28 Feb 2012 01:44:09 +0000 (17:44 -0800)]
Merge "Suppress StrictMode when reading /proc/ files."
Adam Powell [Tue, 28 Feb 2012 01:38:51 +0000 (17:38 -0800)]
Merge "View pressed state dispatching tweaks"
Mathias Agopian [Tue, 28 Feb 2012 01:38:27 +0000 (17:38 -0800)]
Merge "remove dependency on unneeded headers"
Chia-chi Yeh [Tue, 28 Feb 2012 01:35:06 +0000 (17:35 -0800)]
Merge "VpnDialogs: hide the fields when the statistic numbers are unavailable."
Michael Jurka [Tue, 28 Feb 2012 01:15:41 +0000 (17:15 -0800)]
Merge "Remove unnecessary code"
Jamie Gennis [Tue, 28 Feb 2012 01:06:53 +0000 (17:06 -0800)]
Merge "Removed dependecies between BufferQueue and SurfaceTexture"
JP Abgrall [Tue, 28 Feb 2012 01:05:55 +0000 (17:05 -0800)]
Merge "dumpstate: use /system/xbin/su directly"
Jean-Baptiste Queru [Tue, 28 Feb 2012 01:02:15 +0000 (17:02 -0800)]
am
7b6b81f8: am
f016dc1b: am
f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '
7b6b81f89538d34415869710cbf464ba7c28bf9b':
stagefright amr: Avoid C++/C99 for loops with variable declaration
Dave Burke [Tue, 28 Feb 2012 01:01:38 +0000 (17:01 -0800)]
Merge "Increase max size of log size by 50% on userdebug builds."
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:59:59 +0000 (16:59 -0800)]
am
f016dc1b: am
f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '
f016dc1bd7f9a67adac13b0b564692dab8723392':
stagefright amr: Avoid C++/C99 for loops with variable declaration
Mathias Agopian [Tue, 28 Feb 2012 00:58:04 +0000 (16:58 -0800)]
a window could get stuck to gpu composition
this could happen after an orientation change. basically
we need to triger a geometry-changed when the very first buffer
is received
Change-Id: I097e411fd6612c18725737cffccdbf6b2af3511c
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:57:06 +0000 (16:57 -0800)]
am
f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '
f881fa517978adc7ea610a1982e0d071f1fd3425':
stagefright amr: Avoid C++/C99 for loops with variable declaration
Daniel Lam [Sun, 22 Jan 2012 23:26:27 +0000 (15:26 -0800)]
Removed dependecies between BufferQueue and SurfaceTexture
Refactored SurfaceTexture and BufferQueue such that share
no protected members. Created an consumer facing interface
for BufferQueue in preparation of connecting SurfaceTexture
and BufferQueue through a binder.
Change-Id: I938e63e085128148c58d0e26c7213b30145c109f
felipeal [Tue, 28 Feb 2012 00:39:50 +0000 (16:39 -0800)]
Merge "Fixed minor typo on Javadoc"
Eric Laurent [Tue, 28 Feb 2012 00:35:30 +0000 (16:35 -0800)]
Merge "audio preprocessing: fix multiple enable problem"
Alon Albert [Tue, 28 Feb 2012 00:29:55 +0000 (16:29 -0800)]
Merge "Add new Reminder Method: Alarm"
Craig Mautner [Tue, 28 Feb 2012 00:28:15 +0000 (16:28 -0800)]
Merge "Fix bug introduced when moving animation step out from between assignments to wasAnimating and nowAnimating. Now wasAnimating once again contains the animation state prior to the animation step."
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:23:18 +0000 (16:23 -0800)]
Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:03:41 +0000 (16:03 -0800)]
am
84dd87d9: am
015a248e: am
93df415c: Merge "Add stubs for better compatibility"
* commit '
84dd87d992d88d1f407796a41bc8baa27dc97a81':
Add stubs for better compatibility
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:01:31 +0000 (16:01 -0800)]
am
015a248e: am
93df415c: Merge "Add stubs for better compatibility"
* commit '
015a248e631dc10fd6b52ae8773c0a3e0cf752af':
Add stubs for better compatibility
Jean-Baptiste Queru [Mon, 27 Feb 2012 23:58:50 +0000 (15:58 -0800)]
am
93df415c: Merge "Add stubs for better compatibility"
* commit '
93df415c1e0b4c99f274adb3629ce19abf1d0f53':
Add stubs for better compatibility
Eric Fischer [Mon, 27 Feb 2012 23:41:31 +0000 (15:41 -0800)]
Merge "Import translations. DO NOT MERGE"
Jean-Baptiste Queru [Mon, 27 Feb 2012 23:36:21 +0000 (15:36 -0800)]
Merge "Add stubs for better compatibility"
Gilles Debunne [Mon, 27 Feb 2012 23:30:57 +0000 (15:30 -0800)]
Merge "Selection highlight made possible with no editor"
Gilles Debunne [Mon, 27 Feb 2012 23:30:37 +0000 (15:30 -0800)]
Merge "Fix for NPE on long press to start a selection on text."
Gilles Debunne [Mon, 27 Feb 2012 23:28:49 +0000 (15:28 -0800)]
Merge "Fix for NPE when dragging on TextView"
Alex Sakhartchouk [Mon, 27 Feb 2012 23:08:07 +0000 (15:08 -0800)]
Merge "Removing GL calls from librs"
George Mount [Mon, 27 Feb 2012 23:06:29 +0000 (15:06 -0800)]
Merge "Perform action when action button pressed during text input."