54529 Commits

Author SHA1 Message Date
John Wang
5f81f1bcd9 am 74c425d3: am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '74c425d3e95ed0f47b1a5d447007886d01d7ff56':
  Show SIM blocked after 10 time puk wrong entries.
2011-07-14 14:03:11 -07:00
John Wang
74c425d3e9 am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
  Show SIM blocked after 10 time puk wrong entries.
2011-07-14 14:00:58 -07:00
John Wang
54b2a32627 Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 2011-07-14 13:59:10 -07:00
Eino-Ville Talvala
901e022c0c Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera." 2011-07-14 13:38:55 -07:00
Elliott Hughes
49062e3b4c Merge "Fix aidl to cope with multiple collection types per method." 2011-07-14 13:28:00 -07:00
Andreas Huber
c1df573aed Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error" 2011-07-14 13:22:45 -07:00
Andreas Huber
232d5f2aa2 If audio startup fails while executing MediaPlayer::start() do NOT post an error
notification, the error returned by MediaPlayer::start() will suffice.

Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a
related-to-bug: 5020200
2011-07-14 13:02:47 -07:00
Romain Guy
8cfe3d2d95 Merge "Force bitmaps to load in ARGB8888 by default. Bug #5024993" 2011-07-14 12:45:23 -07:00
Romain Guy
99b7b7a7f8 Force bitmaps to load in ARGB8888 by default.
Bug #5024993

Change-Id: Id0c63f675ae188e5a786b7fdd63916e114b9ed4a
2011-07-14 12:42:19 -07:00
Wink Saville
c9822c5aea Fix build.
Changes in ConnectivityService in hc-LTE when merged with changes
happening in Master caused the build to break.

Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af
2011-07-14 12:23:28 -07:00
John Wang
98c3fcc7af Show SIM blocked after 10 time puk wrong entries.
After user enters 10 time wrong puk in puk unlock screen,
device need show the SIM permanently disabled message
is in lock screen.

bug:4905509
Change-Id: I06242834972b3f403cfe99a2edd8bae47d7ed474
2011-07-14 11:46:24 -07:00
Philip Milne
d44264a5ee Merge "Rationalize API after adding maximum size feature." 2011-07-14 11:32:09 -07:00
Narayan Kamath
d1435e998b Merge "Minor documentation updates for the AudioTrack class." 2011-07-14 11:13:07 -07:00
Glenn Kasten
007e62172f Merge "Add MEDIA_UID" 2011-07-14 10:59:40 -07:00
Wink Saville
76326a9d7d am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
  Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-14 10:55:58 -07:00
Jaikumar Ganesh
8c1703015e am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
* commit '6dd4531639157191e6224d3f8af5c9d099ca945f':
  Bluetooth: correcting return value from cancelDiscovery
2011-07-14 10:55:55 -07:00
John Wang
726492eae9 am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
  Add getImei() to Phone interface.
2011-07-14 10:49:38 -07:00
Dianne Hackborn
cadaa3a983 Merge "Improve handling of low memory." 2011-07-14 10:48:01 -07:00
Adam Powell
c29f4e52c3 Nicer API for disabling/enabling the home/up button in action bars.
Have an explicit call for enabling the home/up button. Auto-enable it
if the app targets < ICS to preserve Honeycomb behavior. Auto-enable
it if the app shows home as up.

This prevents unwanted touch/focus feedback on the home button when
the app hasn't wired it up to do anything useful.

Change-Id: Icfe95ab5a11b3998bca08b0fbbfe1bf6c3c89b5d
2011-07-14 10:42:36 -07:00
Dianne Hackborn
ce86ba86df Improve handling of low memory.
Now classify background processes into a set of bins of how much
memory they should try to clear.  The last bin also involves
destroying all activities in that process.

Removed the old code for the simulator that is no longer needed
(yay).  The debugging features it had are now integrated into the
regular oom adj code.

Small fixes to load average service.

Change-Id: Ic8df401714b188c73b50dbc8f8e6345b58f1f3a0
2011-07-14 10:39:39 -07:00
Narayan Kamath
88bde0ce37 Minor documentation updates for the AudioTrack class.
Change-Id: I0c3c220aa433d1917d997a7b1bfa54e61acc26b2
2011-07-14 18:10:47 +01:00
Jaikumar Ganesh
b85f49e2a4 Merge "Remove Car audio class from auto pairing." 2011-07-14 10:08:41 -07:00
Eino-Ville Talvala
83d3352cf7 NEW_API: Add auto-exposure and auto-white balance locking to the Camera.
Unhides the Camera API calls for using the auto-exposure and
auto-white balance locks. Adds documentation about the interaction
between auto-focus and the AE and AWB locks.

Change-Id: I5bf73b9dce1c93e11a17f9d3efb82db1261524c5
2011-07-14 10:05:04 -07:00
James Dong
ad07457ece Merge "Support profile and level query for SW video decoders" 2011-07-14 09:59:24 -07:00
Jeff Hamilton
840a02c3da Merge "unhide public apis" 2011-07-14 09:53:08 -07:00
Jaikumar Ganesh
31d6e440f9 Remove Car audio class from auto pairing.
Majority of the cars don't auto pair unlike headsets, as they have a display.
Instead of maintaining a blacklist of such cars, disable
auto pairing with 0000. This is legacy anyway as newer cars
come with 2.1 pairing.

Change-Id: I644e2da4d11cf2d250d846853523d7975ca000fc
2011-07-14 09:26:02 -07:00
Andreas Huber
b39c07b144 Merge "Include all supported mime types when querying decoder profile/level support." 2011-07-14 09:09:14 -07:00
Andreas Huber
1a54107562 Merge "Remove legacy http support from stagefright, chromium is the new hotness." 2011-07-14 09:09:07 -07:00
Narayan Kamath
e1f2d4111d Merge "Minor cleanups to TextToSpeech." 2011-07-14 08:44:39 -07:00
Glenn Kasten
d86934ae0f Merge "OMX CallbackDispatcher uses C++ Thread not pthread" 2011-07-14 07:54:34 -07:00
Narayan Kamath
b9db1fb9de Minor cleanups to TextToSpeech.
(a) Fix an NPE reported when no TTS engine is installed.
(b) Fix a bad link, and some javadoc typos.

bug: 5004015
Change-Id: I38b97dbb5d7d4065a5ee408fae9138638ed48f40
2011-07-14 15:40:13 +01:00
Jeff Brown
1a70f09327 Merge "Refactor input dispatcher use of window/app handles." 2011-07-14 04:20:56 -07:00
Jeff Brown
c6f4d92839 Merge "Fix invalid JNI call signature. Bug: 5029536" 2011-07-14 04:12:51 -07:00
Jeff Brown
9302c8796f Refactor input dispatcher use of window/app handles.
This change moves the cached window and application input state
into the handle objects themselves.  It simplifies the dispatcher
somewhat because it no longer needs to fix up references to
transient InputWindow objects each time the window list is updated.

This change will also make it easier to optimize setInputWindows
to avoid doing a lot of redundant data copying.  In principle, only
the modified fields need to be updated.  However, for now we
continue to update all fields in unison as before.

It turns out that the input dispatcher was inappropriately retaining
pointers to InputWindow objects within the mWindows InputWindow
vector.  This vector is copy-on-write so it is possible and the
item pointers to change if an editing operation is performed on
the vector when it does not exclusively own the underlying
SharedBuffer.  This bug was uncovered by a previous change that
replaced calls to clear() and appendVector() with a simple use
of operator= which caused the buffer to be shared.  Consequently
after editItemAt was called (which it shouldn't have, actually)
the buffer was copied and the cached InputWindow pointers became
invalid.  Oops.  This change fixes the problem.

Change-Id: I0a259339a6015fcf9113dc4081a6875e047fd425
2011-07-14 04:11:21 -07:00
Jeff Brown
14fcf900ce Fix invalid JNI call signature.
Bug: 5029536

Change-Id: I1f9b3faa77d49e26ef43982ff57cbbf0c3be8b40
2011-07-14 04:08:21 -07:00
Mathew Inwood
e7821cd607 SearchBox API changes, to know when calls succeeded.
Depends on change: I5af94c8df8f24dfafb02c4052381aa547c72684c
(due to SearchBox API change).

Change-Id: If283ecdfa62aecb1fa697b1a2cd43b771b908d72
2011-07-14 11:40:03 +01:00
Jeff Brown
f7537bccb2 Provide more descriptive name for InputChannel ashmem.
Change-Id: I4307de9f717ac4810b1b91ee0c1a3899325acf71
2011-07-13 22:27:37 -07:00
Philip Milne
93cd6a6c78 Rationalize API after adding maximum size feature.
. Change name of Group to Spec
	(with the addition of the fglexibility field, this class no longer represents a group)

. Replace overloaded Group/Spec constructors with factory method

. Bugfix for measure() when alignmentMode == ALIGN_BOUNDS

. Bury as much Java API as possible, to minimize restrictions on future API enhancements

	- make all field access in Group package private
	- use factory methods in place of field assignment

Change-Id: I46a5027a013bf7c3110b77108b8fd0427165cd18
2011-07-13 21:31:20 -07:00
Adam Powell
9837d6d02f Fix bug in submenus opened from icon menus
Change-Id: I8b60ceefbccb5cad78d1b5c55702a2685a5f5382
2011-07-13 20:42:19 -07:00
Adam Powell
648b36bc30 Merge "Preserve spacing for icons in menus" 2011-07-13 20:07:41 -07:00
Adam Powell
9151103ff2 Preserve spacing for icons in menus
Change-Id: I3269fcffb98a84b6a5c5f9198afd2b2eae7d5f02
2011-07-13 20:00:40 -07:00
Glenn Kasten
8b7d1b4d4a Add MEDIA_UID
Change-Id: Iaf03913dce95420e21c79226031b7caaaedf2ce8
2011-07-13 17:39:02 -07:00
Ben Dodson
67671874dc unhide public apis
Change-Id: I3bbe0e7c1e135a4654f63c34c024d7aa10341279
2011-07-13 17:38:33 -07:00
Svetoslav Ganov
f382dc2d97 Merge "Touch exploration gesture events change the window id." 2011-07-13 17:23:41 -07:00
Svetoslav Ganov
63c04eeb00 Touch exploration gesture events change the window id.
1. Touch exploration start and end events are generated
   by the sytstem to provide additional information for
   accessibility services. Since such events do not come
   from any particular window they whould not change the
   id of the window that currently allows exploring its
   content.

2. Touch exploration start and end events were lealing the
   touch explorer class wich is private.

bug:5026258

Change-Id: Icaf3e2bd9566716f2afb876cf8e0d50813b0c76e
2011-07-13 17:22:15 -07:00
Mike Lockwood
e67ebacd15 Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build" 2011-07-13 16:46:50 -07:00
Mike Lockwood
c1b9bbb21c Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 19:45:44 -04:00
Jason Sams
b328269531 Merge "Fix native crash when GL driver fails to initialize." 2011-07-13 16:43:27 -07:00
Dave Santoro
b6e5e7a740 Merge "Contacts contract update for display photos." 2011-07-13 16:23:44 -07:00
Jason Sams
fb06b7a551 Fix native crash when GL driver fails to initialize.
Change-Id: I85714de9029285027dc75fb3b62076be41a4c985
2011-07-13 16:09:42 -07:00