53556 Commits

Author SHA1 Message Date
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
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
RoboErik
48e34174cc Merge "api comment fixes" 2011-06-23 16:00:00 -07:00
Jesse Wilson
98e8b19c7b Warn about the lack of access controls for SD card HTTP caches.
Change-Id: I54adc2f9b57964e15a0fc26b719729e6087b1bda
http://b/4772280
2011-06-23 15:59:32 -07:00
Bart Sears
792dba9e07 Merge "Add Droid Ethiopic fonts" 2011-06-23 15:52:17 -07:00
David Brown
cec25c4e8a CallerInfo query: Turn on "geo description" lookup for unknown numbers
With the latest version of the external/libphonenumber library
<https://android-git.corp.google.com/g/117190> we now have real data for
the PhoneNumberOfflineGeocoder.getDescriptionForNumber() feature.

So enable it in the CallerInfo query.  This means that the incoming call
UI will now show a geo description like "California" or "Maryland" (along
with the number) for unknown incoming numbers.

I also needed to work around an issue with the latest phonenumber library:
The new library apparently requires countryIso to be uppercase (e.g. "US")
but the CountryDetector.detectCountry().getCountryIso() call currently
returns "us", which causes PhoneNumberUtil.parse() to fail.  (This also
broke some ContactsProvider tests too.)  So force the countryIso to
uppercase for now.

TESTED (on Crespo):
  - Incoming calls from an unknown number:
    ==> State name is now displayed.
  - Incoming calls from a number that matches a contact:
    ==> no change in behavior

Bug: 4595580
Change-Id: I03126e1eee99d428e76bbbad5b3856be3874f549
2011-06-23 15:48:25 -07:00
Gloria Wang
1e1b13e62e - Public part of the Metadata API.
- Modify the media framework test for Metadata.

Change-Id: Ib8fa4991f114e1bb88a17ca662844b9b8e1d0faf
2011-06-23 15:28:36 -07:00
RoboErik
e00d58998c api comment fixes
Change-Id: I0fe70ab54c78ba18ae7d759bbfa692c5235008ef
2011-06-23 15:16:55 -07:00
JP Abgrall
40e44467e2 Merge "NetworkStatsService: check kernel bandwidth support before enabling" 2011-06-23 15:06:55 -07:00
tedbo
0694cfe49a Merge "Add method to create a ParcelSurfaceTexture from android.view.Surface." 2011-06-23 14:45:30 -07:00
Scott Main
090117774a am d4f9872c: am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit 'd4f9872cb077abc54cfa2def348f831d24e32ca0':
  docs: add info about manifest attributes that should not change
2011-06-23 14:30:30 -07:00
Raphael Moll
b02367778d am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
* commit 'f9705ef6d3f1502991dd312bfdbfb93cb07fe672':
  Laoutlib_creator: keep original of delegate methods.
2011-06-23 14:30:25 -07:00
Jerry J. Wang
996bdbaaf0 am 4333de2a: (-s ours) am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
* commit '4333de2a8e878b319c0e779942b87c042804d352':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
2011-06-23 14:29:55 -07:00
Scott Main
16d1f17675 am d65fab3d: am e2f74aec: am 929cba13: docs: remove exclamation from media title
* commit 'd65fab3de6381a8b040101c74d5276290de1c7c1':
  docs: remove exclamation from media title
2011-06-23 14:29:50 -07:00
Katie McCormick
c182bd5162 am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL.
* commit '023622997d886074f7c0cf831945a466803acf5e':
  Doc change: updated TOC for Bluetooth CL.
2011-06-23 14:29:25 -07:00
JP Abgrall
b851cc23c8 NetworkStatsService: check kernel bandwidth support before enabling
And catch the actual errors reported by the other side of NetworkManager.


Change-Id: I9a9393b659d6f896ee1bf40a8deaca7853ef8f94
Signed-off-by: JP Abgrall <jpa@google.com>
2011-06-23 14:13:28 -07:00
David Brown
0824b928ce Merge "Update CallerInfo to use the geocoder in the updated location." 2011-06-23 14:08:56 -07:00
Bart Sears
621cbd3feb Add Droid Ethiopic fonts
Add the Ver 1.02 Droid Ethiopic fonts from Monotype.

Adding to git, but not adding them into the fonts.mk file (to copy
to production builds) until we have Fallback support for multiple
styles (i.e. Regular and Bold).

Change-Id: Id86d6006adf753940d7886dd9a2fd558e2fa2773
2011-06-23 13:27:20 -07:00
Jamie Gennis
b950b8e23e Merge "Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode." 2011-06-23 13:02:40 -07:00
Dianne Hackborn
58b8684177 Merge "Fix issue #4770360: older app compatibility mode is really tiny on ICS phones" 2011-06-23 12:13:06 -07:00
Adam Powell
2a08791491 Merge "Fix bug 4904520 - Swap force close/report buttons" 2011-06-23 12:05:50 -07:00
Philip Milne
368c0f900d Merge "Handle baseline aligned rows in which some components define baseline and some don't." 2011-06-23 12:05:09 -07:00
Adam Powell
3187632e0a Fix bug 4904520 - Swap force close/report buttons
Make the force close dialogs consistent with both the new rules for
wizardy-button bar UI flows and the previous arrangement that people
are used to. Force close = negative/back/cancel, Report =
positive/next/ok.

Change-Id: I212ba172f8076238a1833100b025b6e25a538a65
2011-06-23 12:02:27 -07:00
Dianne Hackborn
2b31d53161 Fix issue #4770360: older app compatibility mode is really tiny on ICS phones
We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.

Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
2011-06-23 12:00:54 -07:00
Philip Milne
a1f7b10f72 Handle baseline aligned rows in which some components define baseline and some don't.
Also:

. Make all of the methods in Alignment package private.
. Inlucde Tor's test case

Change-Id: If78a6a3b653723d9e12d6b162fd0c86b11a82dff
2011-06-23 11:41:57 -07:00