OSDN Git Service
Chris Craik [Wed, 3 Aug 2011 16:46:15 +0000 (09:46 -0700)]
Merge "Added automated performance test to TileBenchmark"
Jean-Michel Trivi [Wed, 3 Aug 2011 16:09:43 +0000 (09:09 -0700)]
Merge "Remote control display API and implementation"
Debashish Chatterjee [Wed, 3 Aug 2011 13:06:30 +0000 (06:06 -0700)]
Merge "Step1 of renaming READ_WRITE_OWN_VOICEMAIL to ADD_VOICEMAILS."
Dianne Hackborn [Wed, 3 Aug 2011 05:48:16 +0000 (22:48 -0700)]
Merge "Reduce memory usage of status bar expanded view."
Adam Powell [Wed, 3 Aug 2011 01:44:50 +0000 (18:44 -0700)]
Merge "Fix bug
5098288 - Rethink the suite of new themes"
Mathias Agopian [Wed, 3 Aug 2011 01:31:08 +0000 (18:31 -0700)]
Merge "fix a crasher in surfaceflinger"
Mathias Agopian [Wed, 3 Aug 2011 01:29:51 +0000 (18:29 -0700)]
fix a crasher in surfaceflinger
this would happen if being told to draw before a buffer
was available.
Change-Id: I46d121c73e883078cdbf952063e38b0076f79038
Romain Guy [Wed, 3 Aug 2011 00:34:06 +0000 (17:34 -0700)]
Merge "Paint style and stroke width affect text rendering. Bug #
5112207"
Robert Greenwalt [Wed, 3 Aug 2011 00:32:05 +0000 (17:32 -0700)]
Merge "Reduce ConnectivityService logging"
Mathias Agopian [Wed, 3 Aug 2011 00:09:34 +0000 (17:09 -0700)]
Merge "fix an issue where the screen could be stale after a surface size change"
Mathias Agopian [Wed, 3 Aug 2011 00:09:18 +0000 (17:09 -0700)]
Merge "update HWC data structures even when a layer is marked for SKIP"
Mathias Agopian [Wed, 3 Aug 2011 00:07:53 +0000 (17:07 -0700)]
Merge "Add a h/w composer API to allow the HAL to trigger a redraw"
Kenny Root [Wed, 3 Aug 2011 00:05:06 +0000 (17:05 -0700)]
Merge "Parent's canonical path; not parent of canonical"
Romain Guy [Wed, 3 Aug 2011 00:03:22 +0000 (17:03 -0700)]
Merge "Add the ability to enable/disable marquee fading per device"
Dianne Hackborn [Tue, 2 Aug 2011 23:57:50 +0000 (16:57 -0700)]
Merge "Clear the bitmap from the canvas in a lot of places."
Philip Milne [Tue, 2 Aug 2011 23:22:26 +0000 (16:22 -0700)]
Merge "Fix for http://b/issue?id=
5081478"
Mathias Agopian [Tue, 2 Aug 2011 22:51:37 +0000 (15:51 -0700)]
update HWC data structures even when a layer is marked for SKIP
Change-Id: I16bcf44cd617814a14a795429bde2f39f411077d
Robert Greenwalt [Tue, 2 Aug 2011 22:47:50 +0000 (15:47 -0700)]
Merge "Stop creating threads for each MDST."
Matthew Xie [Tue, 2 Aug 2011 22:44:28 +0000 (15:44 -0700)]
Merge "Move mBluetoothService.runBluetooth after broadcasting the STATE_ON intent."
Mike Lockwood [Tue, 2 Aug 2011 22:31:34 +0000 (15:31 -0700)]
Merge "USB: Fix NPE that occurred when restoring default function in UsbManager.setEnabledFunctions"
Eric Fischer [Tue, 2 Aug 2011 22:24:05 +0000 (15:24 -0700)]
Merge "Import revised translations."
repo sync [Tue, 2 Aug 2011 21:48:43 +0000 (14:48 -0700)]
Merge "Fix networktype on per process DNS setting"
Jeff Hamilton [Tue, 2 Aug 2011 20:33:02 +0000 (13:33 -0700)]
Merge "Remove the binder interface for LLCP."
Conley Owens [Tue, 2 Aug 2011 20:32:26 +0000 (13:32 -0700)]
am
0793586b: am
f8c1f129: am
e1d27154: am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
0793586bf8f4dce71d0b4d7ff2f212129b3f76fe':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:30:51 +0000 (13:30 -0700)]
am
f8c1f129: am
e1d27154: am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
f8c1f1298ac3ede518c8d29eeb6719746c6afaf0':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:24:00 +0000 (13:24 -0700)]
am
e1d27154: am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
e1d271546767a8e2213aabba92506af9e97020b4':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:21:12 +0000 (13:21 -0700)]
am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
f87743e7bdfd10b9a1719036a6320a32df078879':
Prevent NullPointerException cases while using SipService.
Romain Guy [Tue, 2 Aug 2011 20:18:51 +0000 (13:18 -0700)]
Merge "Properly cancel pending buffers on window size change"
Conley Owens [Tue, 2 Aug 2011 20:08:14 +0000 (13:08 -0700)]
Merge "Prevent NullPointerException cases while using SipService."
Romain Guy [Tue, 2 Aug 2011 19:38:42 +0000 (12:38 -0700)]
Merge "Copy constructors should actually copy stuff. Bug #
5027094"
Christopher Tate [Tue, 2 Aug 2011 19:18:40 +0000 (12:18 -0700)]
Merge "Reduce backup manager logspew"
Amith Yamasani [Tue, 2 Aug 2011 18:51:57 +0000 (11:51 -0700)]
Merge "Volume panel changes."
Xavier Ducrohet [Tue, 2 Aug 2011 18:48:23 +0000 (11:48 -0700)]
Merge "Layoutlib: simple comment fix."
Martijn Coenen [Tue, 2 Aug 2011 18:44:23 +0000 (11:44 -0700)]
Merge "Removed unused import from AnimatorSet."
Romain Guy [Tue, 2 Aug 2011 18:33:57 +0000 (11:33 -0700)]
Merge "Prevent crash with NPE in HardwareRenderer Bug #
5109839"
Jaikumar Ganesh [Tue, 2 Aug 2011 18:25:13 +0000 (11:25 -0700)]
Merge "Fix tethering using BT."
Gilles Debunne [Tue, 2 Aug 2011 17:58:42 +0000 (10:58 -0700)]
Merge "Bug
4280211: permission green checkboxes removed"
Hugo Hudson [Tue, 2 Aug 2011 17:55:13 +0000 (10:55 -0700)]
Merge "Add OpenableColumns to the Voicemail table."
Xavier Ducrohet [Tue, 2 Aug 2011 17:43:45 +0000 (10:43 -0700)]
Merge "Misc layoutlib fix in preparation of the access change in framework code."
Derek Sollenberger [Tue, 2 Aug 2011 17:39:43 +0000 (10:39 -0700)]
Merge "Reverting until we can find a better way to address this issue without affecting nine-patches with large stretchable areas."
Martijn Coenen [Tue, 2 Aug 2011 17:39:34 +0000 (10:39 -0700)]
Merge "Fix ConcurrentModificationException in AnimatorSet."
James Dong [Tue, 2 Aug 2011 17:36:44 +0000 (10:36 -0700)]
Merge "Start thread pool for binder calls"
Eric Fischer [Tue, 2 Aug 2011 17:29:11 +0000 (10:29 -0700)]
Merge "Restore deleted string still referenced from a layout."
Mike Lockwood [Tue, 2 Aug 2011 17:01:53 +0000 (10:01 -0700)]
Merge "UsbManager: add getDefaultFunction()"
Gloria Wang [Tue, 2 Aug 2011 16:56:51 +0000 (09:56 -0700)]
Merge "Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have called Resync() which changes mCurrentPos. For bug
4869063."
Gloria Wang [Tue, 2 Aug 2011 16:22:05 +0000 (09:22 -0700)]
Merge "Fix ordering assumption of argument evaluation."
Gloria Wang [Tue, 2 Aug 2011 16:21:53 +0000 (09:21 -0700)]
Merge "Fix ordering assumption of argument evaluation."
Yu Shan Emily Lau [Tue, 2 Aug 2011 15:39:01 +0000 (08:39 -0700)]
Merge "Replace the hard coded video recording properties with media profile."
Justin Ho [Tue, 2 Aug 2011 14:27:38 +0000 (07:27 -0700)]
Merge "Updated btn_default and btn_toggle assets Bug:
5076695"
Justin Ho [Tue, 2 Aug 2011 14:27:22 +0000 (07:27 -0700)]
Merge "Updated scrollbars and fast scroller assets. Bug:
5076695"
Justin Ho [Tue, 2 Aug 2011 14:27:12 +0000 (07:27 -0700)]
Merge "Updated progress bar and scrubbers, adding xhdpi Bug:
5076695"
Justin Ho [Tue, 2 Aug 2011 14:27:03 +0000 (07:27 -0700)]
Merge "Updated spinners Bug:
5076695"
Daniel Sandler [Tue, 2 Aug 2011 11:39:46 +0000 (04:39 -0700)]
Merge "Refresh tablet notification drawer."
Daniel Sandler [Tue, 2 Aug 2011 11:39:35 +0000 (04:39 -0700)]
Merge "Merging ongoing + latest notifications on phone UI to match tablets."
Wu-cheng Li [Tue, 2 Aug 2011 07:16:28 +0000 (00:16 -0700)]
Merge "Add camera recording hint parameter."
satok [Tue, 2 Aug 2011 07:11:06 +0000 (00:11 -0700)]
Merge "Move SpellCheckerSession"
Shih-wei Liao [Tue, 2 Aug 2011 06:26:39 +0000 (23:26 -0700)]
Merge "Finish the refactor work of bccPrepareExecutable"
Mathias Agopian [Mon, 1 Aug 2011 23:32:21 +0000 (16:32 -0700)]
Add a h/w composer API to allow the HAL to trigger a redraw
This is useful in various situations, for instance if the HAL
wants to change its compositing strategy.
Bug:
4488017
Change-Id: I5afc14e5917c6db7926d7417d48677d5aba50caa
satok [Tue, 2 Aug 2011 02:49:37 +0000 (19:49 -0700)]
Merge "Add a method to set the current spell checker"
Dianne Hackborn [Tue, 2 Aug 2011 01:59:58 +0000 (18:59 -0700)]
Merge "Move ImageWallpaper to SystemUI process."
Romain Guy [Tue, 2 Aug 2011 01:57:43 +0000 (18:57 -0700)]
Merge "Reduce the amount of data cached by the gradients cache."
Adam Powell [Tue, 2 Aug 2011 01:31:40 +0000 (18:31 -0700)]
Merge "Fix bug
5105394 - Get rid of btn_default_small"
Jeff Brown [Tue, 2 Aug 2011 00:48:21 +0000 (17:48 -0700)]
Merge "Refactor input reader to add stylus support. Bug:
5064702"
Romain Guy [Tue, 2 Aug 2011 00:42:36 +0000 (17:42 -0700)]
Merge "Allow Canvas.setBitmap() to receive a null Bitmap."
Adam Powell [Tue, 2 Aug 2011 00:20:06 +0000 (17:20 -0700)]
Merge "Fix bug
5090996 - Crash on tapping Menu on dial pad"
Mathias Agopian [Mon, 1 Aug 2011 23:36:02 +0000 (16:36 -0700)]
Merge "connect/disconnect is now called from our EGL wrapper"
Jeff Sharkey [Mon, 1 Aug 2011 23:33:50 +0000 (16:33 -0700)]
Merge "Add operation counts to network statistics."
Romain Guy [Mon, 1 Aug 2011 22:29:56 +0000 (15:29 -0700)]
Merge "Use high precision iterators on specific GPUs Bug #
5098359"
Brett Chabot [Mon, 1 Aug 2011 22:07:01 +0000 (15:07 -0700)]
Merge "Add functional test for screenshots."
Jean-Baptiste Queru [Mon, 1 Aug 2011 21:12:43 +0000 (14:12 -0700)]
am
8fb7bd4d: am
5bb3129c: (-s ours) am
a2616220: am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
8fb7bd4d02cd4ad2111699778e64464d979f03bb':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 21:10:39 +0000 (14:10 -0700)]
am
5bb3129c: (-s ours) am
a2616220: am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
5bb3129c7eabce34d7c1469826e1795d4b225bb3':
Stagefright: Return error if codec takes too long to return a buffer.
Chia-chi Yeh [Mon, 1 Aug 2011 21:09:58 +0000 (14:09 -0700)]
Merge "Revert "Unhide APIs for user space VPN.""
Mathias Agopian [Sat, 30 Jul 2011 00:55:48 +0000 (17:55 -0700)]
connect/disconnect is now called from our EGL wrapper
the original connect/disconnect hooks are deprecated
and replace by api_connect/api_disconnect. the original
hooks are no no-ops.
api_connect/api_disconnect is now only called from the
android framework.
Bug:
5057915
Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
Romain Guy [Mon, 1 Aug 2011 21:02:54 +0000 (14:02 -0700)]
Merge "Plug memory leak in EditText."
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:59:02 +0000 (13:59 -0700)]
am
a2616220: am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:55:45 +0000 (13:55 -0700)]
am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
5e57c2cf83ef62e9887592b46a4c3352662fb988':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:43:07 +0000 (13:43 -0700)]
Merge "Stagefright: Return error if codec takes too long to return a buffer."
Jamie Gennis [Mon, 1 Aug 2011 20:40:29 +0000 (13:40 -0700)]
Merge "SurfaceFlinger: use async mode for video & cam"
Bjorn Bringert [Mon, 1 Aug 2011 20:39:30 +0000 (13:39 -0700)]
Merge "Fix exception when a focused item is detached."
Andreas Huber [Mon, 1 Aug 2011 20:26:11 +0000 (13:26 -0700)]
Merge "Fix NALU extraction of unit starts with a 0x00 nalType"
Jamie Gennis [Mon, 1 Aug 2011 20:25:03 +0000 (13:25 -0700)]
Merge "SurfaceTexture: allow set_buffer_count(2)"
Romain Guy [Mon, 1 Aug 2011 20:21:31 +0000 (13:21 -0700)]
Merge "Fixing initialization cleanup in activity instrumentation test case"
Dianne Hackborn [Mon, 1 Aug 2011 19:23:47 +0000 (12:23 -0700)]
Merge "Hide permissions that are not available to apps."
Mathias Agopian [Mon, 1 Aug 2011 19:15:07 +0000 (12:15 -0700)]
Merge "improve GraphicAllocator dump method"
Jeff Brown [Mon, 1 Aug 2011 19:14:24 +0000 (12:14 -0700)]
Merge "Tweak hover for better accessibility and compatibility. Bug:
5087943"
Jamie Gennis [Mon, 1 Aug 2011 19:10:47 +0000 (12:10 -0700)]
Merge "SurfaceFlinger: abandon Layer SurfaceTextures"
Eric Fischer [Mon, 1 Aug 2011 18:23:08 +0000 (11:23 -0700)]
am
72b7a7d9: (-s ours) am
f01b3cfa: (-s ours) am
c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
72b7a7d90b631a703681751c02f1447e3c75ccb0':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 1 Aug 2011 18:19:59 +0000 (11:19 -0700)]
am
f01b3cfa: (-s ours) am
c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
f01b3cfa9ac2869e3762a90917569186039a9665':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 1 Aug 2011 18:17:17 +0000 (11:17 -0700)]
am
c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 1 Aug 2011 18:15:58 +0000 (11:15 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Andreas Huber [Mon, 1 Aug 2011 17:46:51 +0000 (10:46 -0700)]
Merge "Start playing live streaming HLS content from the first segment."
Matthew Xie [Mon, 1 Aug 2011 17:20:30 +0000 (10:20 -0700)]
Merge "Change setDevicePropertyNative to no block."
Luca Zanolin [Mon, 1 Aug 2011 16:51:29 +0000 (09:51 -0700)]
Merge "Sort the suggestions based based on the length of the text they are attached too."
Mike Lockwood [Mon, 1 Aug 2011 16:31:57 +0000 (09:31 -0700)]
Merge "MediaScanner: Move genre table management to MediaProvider"
Justin Ho [Mon, 1 Aug 2011 14:27:11 +0000 (07:27 -0700)]
Merge "Update list_ states Bug:
5076695"
Jeff Brown [Wed, 27 Jul 2011 23:04:54 +0000 (16:04 -0700)]
Refactor input reader to add stylus support.
Bug:
5064702
Introduced the concept of an InputListener to further decouple
the InputReader from the InputDispatcher. The InputListener
exposes just the minimum interface that the InputReader needs
to communicate with the outside world. The InputReader
passes arguments to the InputListener by reference, which makes
it easy to queue them up.
Consolidated all of the InputReader locks into one simple global
Mutex. The reason this wasn't done before was due to potential
re-entrance in outbound calls to the InputDispatcher. To fix this,
the InputReader now queues up all of the events it wants to send
using a QueuedInputListener, then flushes them outside of the
critical section after all of the event processing is finished.
Removing all of the InputMapper locks greatly simplifies the
implementation.
Added tests for new stylus features such as buttons, tool types,
and hovering.
Added some helpers to BitSet32 to handle common code patterns
like finding the first marked bit and clearing it.
Fixed a bug in VelocityTracker where the wrong pointer trace
could get cleared when handling ACTION_POINTER_DOWN. Oops.
Changed PointerCoords so it no longer stores useless zero
axis values. Removed editAxisValue because it is not very
useful when all zero value axes are absent and therefore
cannot be edited in place.
Added dispatch of stylus hover events.
Added support for distance and tool types.
Change-Id: I4cf14d134fcb1db7d10be5f2af7b37deef8f8468
Jamie Gennis [Sat, 30 Jul 2011 22:06:10 +0000 (15:06 -0700)]
SurfaceFlinger: use async mode for video & cam
This change makes SurfaceFlinger's SurfaceTexture objects default to
async mode whenever a camera or video decoder connects. This behavior
can be disabled by #defining NEVER_DEFAULT_TO_ASYNC_MODE.
Change-Id: I8965951d1775915da180e4af298dd7af3afafecc
Jamie Gennis [Sat, 30 Jul 2011 23:00:11 +0000 (16:00 -0700)]
SurfaceTexture: allow set_buffer_count(2)
This change relaxes an error check in SurfaceTexture::setBufferCount to
allow clients to explicitly set a buffer count of 2. The clients that
will do this are camera and video decode. Previously it was thought
that for those clients we would always use async mode, which requires a
minimum of 3 buffers. However, we now believe that for some devices it
may make sense to use synchronous mode (with 2 buffers) to reduce memory
usage.
Bug:
5088418
Change-Id: I620a0ef75075745be9d6c8219e0246aaf33ba950
Jamie Gennis [Sat, 30 Jul 2011 21:33:49 +0000 (14:33 -0700)]
SurfaceFlinger: abandon Layer SurfaceTextures
This change makes the Layer::onRemoved method call
SurfaceTextures::abandon on the layer's SurfaceTexture. This will cause
all client-initiated operations on the SurfaceTexture to fail. In
particular, this will result in an error on the client side, rather than
a deadlock when removing a layer that used a SurfaceTexture in
synchronous mode.
Change-Id: I14014d00369f29560a21b606831edee432bb8867
Bug:
5020874
Justin Ho [Fri, 29 Jul 2011 23:55:51 +0000 (16:55 -0700)]
Merge "Updated backgrounds Bug:
5076695"