53583 Commits

Author SHA1 Message Date
Tsu Chiang Chuang
b40ec927bb Merge "adding notification stress tests." 2011-06-24 16:55:36 -07:00
Robert Greenwalt
554475f09c Merge "resolved conflicts for merge of 40717996 to master" 2011-06-24 16:39:08 -07:00
Tsu Chiang Chuang
a760e55783 adding notification stress tests.
Change-Id: Ideaae33843685fcbec4c4f38bf9c2ced97c9bf86
2011-06-24 16:19:37 -07:00
Robert Greenwalt
86994c1fc1 resolved conflicts for merge of 40717996 to master
Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada
2011-06-24 16:10:06 -07:00
Dianne Hackborn
7cec14235d Merge "Small cleanup of am/pm commands." 2011-06-24 15:22:22 -07:00
Christopher Tate
78a7f12043 Merge "Fix settings restore" 2011-06-24 15:15:51 -07:00
Christopher Tate
28cdb9e104 Fix settings restore
Also correct the debug-mode logging of error locations in backup data.
Bug 4914182

Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
2011-06-24 15:06:48 -07:00
Romain Guy
c1ba416af5 Merge "Reduce the number of UI events required to update a SurfaceTexture." 2011-06-24 14:56:20 -07:00
Romain Guy
58f4edb770 Reduce the number of UI events required to update a SurfaceTexture.
Change-Id: I9330c9646654fff57dcd6817c86e587a6490a9ad
2011-06-24 14:55:55 -07:00
Jesse Wilson
9bc0521e2b Merge "Test that algorithm name is case-insensitive for digest auth." 2011-06-24 14:33:46 -07:00
Jesse Wilson
df867f8f80 Test that algorithm name is case-insensitive for digest auth.
Change-Id: I891a533ae3b16b838925fa488093c19dfeb32efa
http://code.google.com/p/android/issues/detail?id=16051
2011-06-24 13:50:37 -07:00
Dianne Hackborn
46d110329e Small cleanup of am/pm commands.
Change-Id: I5af730bc177635821a82d4dd3ec9130a5dcd525a
2011-06-24 13:22:45 -07:00
Romain Guy
c897fbfaf9 Merge "Code cleanup" 2011-06-24 13:21:30 -07:00
Romain Guy
02ccac69fd Code cleanup
Change-Id: I64c346004e0adf9a776d0315534d4fe445f0c0ca
2011-06-24 13:20:23 -07:00
Daisuke Miyakawa
b81b1c91d8 Merge "Uppercase region code so that AsYouTypeFormatter works correctly." 2011-06-24 12:32:04 -07:00
Fabrice Di Meglio
a54a600bc4 Merge "Fix bug #4813026 resolved direction of view doesn't change after layout direction changes" 2011-06-24 12:21:28 -07:00
Fabrice Di Meglio
d3d4b4b86a Merge "Fix potential advances overrun in TextLayoutCache." 2011-06-24 12:02:58 -07:00
Doug Felt
b092f55c37 Fix potential advances overrun in TextLayoutCache.
Change-Id: Ibec544f249833a28fe8ef9a15fc8ab48fddfc51c
2011-06-24 11:54:00 -07:00
John Reck
f4db8d566c Merge "Don't resend WEBKIT_DRAW if paused" 2011-06-24 11:36:10 -07:00
Jaikumar Ganesh
c9286ebbf4 Merge "Implement APIs for Bluetooth Health profile." 2011-06-24 11:34:35 -07:00
Jaikumar Ganesh
2ea1e85dcb Implement APIs for Bluetooth Health profile.
This first patch implements all the APIs.
The APIs wil be made public soon. The data specification
API will be submited in another patchset.
Change-Id: I2462683b7e07380e2c42474b0036b34d03b4bed1
2011-06-24 11:31:43 -07:00
John Reck
1c1e6df04a Don't resend WEBKIT_DRAW if paused
Bug: 4606210
 If a WEBKIT_DRAW message came in after the WebView was paused,
 it would fail to draw causing it to re-send the WEBKIT_DRAW message
 which would lead to an infinite loop until the WebView is resumed.
 Fix this by not re-sending the WEBKIT_DRAW message if webview is paused.

Change-Id: I3dd946e4e948cf3fd6af07ba6f7fdac2f967a631
2011-06-24 11:07:09 -07:00
Amith Yamasani
b0b1b11b96 Merge "SearchView improvements per design." 2011-06-24 10:58:38 -07:00
Jaikumar Ganesh
e0ac113b47 Merge "Fix excessive locking synchronization leading to deadlocks." 2011-06-24 09:28:02 -07:00
The Android Open Source Project
a6bdb4c771 Reconcile with gingerbread-release
Change-Id: Ic4aca5ef26cbfb97281582ddb6bfe290f60c29fc
2011-06-24 08:08:41 -07:00
Shaopeng Jia
5b0b167f7f Uppercase region code so that AsYouTypeFormatter works correctly.
Change-Id: Iaf46ec5241a1a8984753bd6d8f9f842884efaa15
2011-06-24 13:50:43 +02:00
Hung-ying Tyan
808be0d064 Merge "Restart NAT port timeout measurement when keepalive fails and other fixes" 2011-06-24 01:37:53 -07:00
Hung-ying Tyan
2c13dd7755 Merge "Execute all the due wakeup events in SipWakeupTimer." 2011-06-24 01:37:33 -07:00
Hung-ying Tyan
e65f3a896f Restart NAT port timeout measurement when keepalive fails and other fixes
Misc keepalive fixes including:
+ Restart NAT port timeout measurement when keepalive fails. The max interval
  is set to the current keepalive interval.
+ When exception occurs during sending a keepalive, restarts registration.
+ When exception occurs during measurement, retry for a limited times before
  giving up.

Change-Id: I7aa787a5ec7c4c9b4334aa1017371d9049b3520c
2011-06-24 15:28:15 +08:00
Grace Kloba
5c5050d902 Make TextureView to use async SurfaceTexture.
With this, there is no synchronous destroy SurfaceTexture requirement any more.

Revert the previous change which only applies to the sync SurfaceTexture.

Change-Id: Id4790d38a27f2982d0c8ad471bc1107683d27ffc
2011-06-23 22:32:04 -07:00
Mathias Agopian
138f33bcef Merge "Add allowSynchronousMode to SurfaceTexture constructor." 2011-06-23 21:31:33 -07:00
Grace Kloba
0904d0af81 Add allowSynchronousMode to SurfaceTexture constructor.
Change-Id: I54f30a3c16bbe6b813f3bcd1d389da5627531304
2011-06-23 21:21:47 -07:00
Svetoslav Ganov
f95d7f5467 Merge "Case insensitive for real" 2011-06-23 19:21:49 -07:00
Guang Zhu
3af0b4e125 Case insensitive for real
previous code was comparing to the unconverted CharSequence, so
it's never going to find a match if the string is mixed case

Change-Id: Ifd537d9781b7da1a2328f01b6f2f3229ca7d950b
2011-06-23 19:14:01 -07:00
Anu Sundararajan
3db9f38174 Stagefright: add support for gralloc OMX_UseBuffer.
XXX: This change should go along with a documentation change to
HardwareAPI.h that describes the new extension.

This change adds support for passing a buffer_handle_t to OMX_UseBuffer
during OMXCodec initialization. This new way of passing the
buffer_handle_t's replaces the old OMX_SetParameter-based approach, and
this change deprecates that interface, but still supports it for OMX IL
implementations that do not support the new interface.

Change-Id: If9c1cb3c6c349c54dab094aeb8af13eae9f85271
Signed-off-by: Jamie Gennis <jgennis@google.com>
Signed-off-by: Sarthak Aggarwal <sarthak@ti.com>
2011-06-23 18:35:25 -07:00
Anu Sundararajan
d35df4412b Integrating TI OMAP4 Video Decoder
Added the video decoder component name to kDecoderInfo.
Set the quirks for the video decoder.
Add a new color format to OMX_IVCommon.h to denote TI OMAP4 NV12 color format.
Added a color conversion routine [ from NV12 to RGB ] for thumbnail generation.

Change-Id: I6b23c36441645ef65ec7406ba262d19f89cf64fd
Signed-off-by: Devaraj Rangasamy <dev@ti.com>
Signed-off-by: Sreenidhi Koti <sreenidhi@ti.com>
Signed-off-by: Anu Sundararajan <sanuradha@ti.com>
2011-06-23 18:35:24 -07:00
Jaikumar Ganesh
5312af0c95 Fix excessive locking synchronization leading to deadlocks.
We should never have to look on the entire instance. There
are many places in the code where it there and we need to fix it.
This is a start. In this particular case what we are protecting
is the properties map of the remote device and thus we just need to lock
on it. Ofcourse, it would be better to have a state machine but this
is good for now.

Deadlock: When a new device was found it will call addProperties which will hold
a lock. addProperties calls into BluetoothService. Now Settings app makes a call
into BluetoothService which will call into this file and we have a deadlock.

Change-Id: Ieb69d5ace222bf5d1e6677af151241153303099f
2011-06-23 17:37:07 -07:00
Amith Yamasani
246529891e SearchView improvements per design.
- X is visible only if there is text, or we need a way to close a
search field that is iconified by default.
- Search dialog (legacy) has a back button to the left.
- Hitting X on a non-focused search view will bring it into focus
and show the keyboard if necessary.

Change-Id: I5a30bb08adcf84639a922a9e13be1d1562f714e6
2011-06-23 17:35:32 -07:00
Fred Quintana
fe35597064 Merge "Make the AbstractAccountAuthenticator return an error to the AccountManagerService if it detects a RuntimeException." 2011-06-23 17:33:53 -07:00
Fabrice Di Meglio
039ad7a431 Merge "add TextView page to BiDiTests" 2011-06-23 17:14:00 -07:00
David Brown
62250fbcd1 Merge "CallerInfo query: Turn on "geo description" lookup for unknown numbers" 2011-06-23 17:12:47 -07:00
Stephen Hines
cf86dc2997 Merge "Move divsi3, modsi3, udivsi3, umodsi3 to libbcc." 2011-06-23 17:08:02 -07:00
Stephen Hines
7c1747c13c Merge "Remove verbose logging, update test app and docs." 2011-06-23 17:07:10 -07:00
Fred Quintana
5d1a0c3933 Make the AbstractAccountAuthenticator return an error to the AccountManagerService
if it detects a RuntimeException.

Bug: 4726899
Change-Id: I5c478464cd0d426722257b2c5c75f964cd839ea6
2011-06-23 17:03:44 -07:00
Adam Powell
95c0f924b2 Merge "Fix bug 4771354 - Phone landscape action bar subtitle slightly cut off on the bottom" 2011-06-23 17:00:00 -07:00
Adam Powell
c8b0b005cb Fix bug 4771354 - Phone landscape action bar subtitle slightly cut off
on the bottom

Let action bar title sizes adapt for restricted space in landscape.

Fix home spacing for tablets to eliminate redundant layout.

Change-Id: If38a43d87ca1aebf96b5d7adfdb1cf36c41ec07e
2011-06-23 16:56:07 -07:00
Stephen Hines
e352f05d3a Move divsi3, modsi3, udivsi3, umodsi3 to libbcc.
BUG=3435530

Change-Id: I4e90a6cdf5af534f93d83093ea31b1defd1e896c
2011-06-23 16:49:00 -07:00
Stephen Hines
3d782666d7 Remove verbose logging, update test app and docs.
Change-Id: I6659c5e51a747011239128dc2682a5d78aecfa26
2011-06-23 16:18:28 -07:00
Gloria Wang
5510a153bf Merge "- Public part of the Metadata API. - Modify the media framework test for Metadata." 2011-06-23 16:17:55 -07:00
Jesse Wilson
52da3a4328 Merge "Warn about the lack of access controls for SD card HTTP caches." 2011-06-23 16:04:00 -07:00