83595 Commits

Author SHA1 Message Date
Jeff Brown
f404d10225 Merge "Fix build for some javac compilers." into jb-mr1-dev 2012-08-29 17:00:30 -07:00
Jeff Brown
29d8d267dd Fix build for some javac compilers.
It seems some compiler versions don't like trailing
commas in attribute lists.  Weird.

Change-Id: I3a05f49a2e94f63fe1662d14c1d8a7ee249d8a16
2012-08-29 16:59:27 -07:00
Jim Miller
5a05f2bf22 Merge "Fix MENU key in keyguard." into jb-mr1-dev 2012-08-29 16:58:35 -07:00
Jim Miller
95b005c196 Fix MENU key in keyguard.
This re-enables the MENU key in keyguard so that automation tests still work.

Change-Id: I3d2fbf9240e12dc4a243354fa09e5d639304be6e
2012-08-29 16:45:54 -07:00
Jake Hamby
b35e4d778a Fix CDMA decoding of multipart UTF-16 SMS messages.
Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: Iba9e7156bd7df94e972963959a7ce1c78464f7f5
2012-08-29 16:36:22 -07:00
Matthew Xie
9e3045c75c Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev 2012-08-29 16:30:14 -07:00
Jeff Sharkey
8ea0dc6a89 Shared OBB storage across users.
To avoid downloading large OBB files separately for each user,
provide a shared view of /sdcard/Android/obb to all apps.  Added
upgrade step to migrate the owners existing OBB files to become
the default view.

Bug: 7008879
Change-Id: I199321552fa7d4b97d5ed7fc3b3bc41f23618601
2012-08-29 16:20:03 -07:00
Irfan Sheriff
a28c18fc61 Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev 2012-08-29 15:55:43 -07:00
Chris Craik
402206b6e2 Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev 2012-08-29 15:53:31 -07:00
John Spurlock
b2c94ec893 Merge "Change default setting for dreams to 'when docked'" into jb-mr1-dev 2012-08-29 15:53:31 -07:00
Matthew Xie
3b6214f373 Turn off verbose debug message in BluetoothAdapter
Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
2012-08-29 15:47:41 -07:00
Jeff Brown
d5ea3b4647 Merge "Add initial multi-display support." into jb-mr1-dev 2012-08-29 15:43:55 -07:00
Benoit Goby
509bf2d2cf UsbDebuggingManager: Fix restart when toggling USB debugging
Change-Id: Iaaec9162b03c4ea77735d096eec670392c61308a
2012-08-29 15:43:51 -07:00
Benoit Goby
0552cbcf29 Merge "UsbDebuggingManager: add missing break in switch" into jb-mr1-dev 2012-08-29 15:42:36 -07:00
Jeff Brown
731b8996ea Merge "Run with scissors." into jb-mr1-dev 2012-08-29 15:41:57 -07:00
Selim Gurun
8506ce1a3f Merge "Provide referer to browser on download request." into jb-mr1-dev 2012-08-29 15:39:11 -07:00
Irfan Sheriff
6bfc88876a Fix DHCP handling at disconnect/reconnect
Wifi can have a quick disconnection followed by a reconnection. We used to
create a new DHCP state machine thread for every new connection and
never really waited until it quit after disconnect. This may have lead to
situations where repeated disconnect/reconnects resulted in multiple dhcp
start calls.

We now keep the statemachine after a disconnect and only shut it at supplicant
stop.

Bug: 6417686
Change-Id: Icf66efdc654be886e3eb46c81f09f8cce536f2f6
2012-08-29 15:35:57 -07:00
Jeff Brown
bd6e1500ae Add initial multi-display support.
Split the DisplayManager into two parts.  One part is bound
to a Context and takes care of Display compatibility and
caching Display objects on behalf of the Context.  The other
part is global and takes care of communicating with the
DisplayManagerService, handling callbacks, and caching
DisplayInfo objects on behalf of the process.

Implemented support for enumerating Displays and getting
callbacks when displays are added, removed or changed.

Elaborated the roles of DisplayManagerService, DisplayAdapter,
and DisplayDevice.  We now support having multiple display
adapters registered, each of which can register multiple display
devices and configure them dynamically.

Added an OverlayDisplayAdapter which is used to simulate
secondary displays by means of overlay windows.  Different
configurations of overlays can be selected using a new
setting in the Developer Settings panel.  The overlays can
be repositioned and resized by the user for convenience.

At the moment, all displays are mirrors of display 0 and
no display transformations are applied.  This will be improved
in future patches.

Refactored the way that the window manager creates its threads.
The OverlayDisplayAdapter needs to be able to use hardware
acceleration so it must share the same UI thread as the Keyguard
and window manager policy.  We now handle this explicitly as
part of starting up the system server.  This puts us in a
better position to consider how we might want to share (or not
share) Loopers among components.

Overlay displays are disabled when in safe mode or in only-core
mode to reduce the number of dependencies started in these modes.

Change-Id: Ic2a661d5448dde01b095ab150697cb6791d69bb5
2012-08-29 15:34:17 -07:00
Svetoslav Ganov
f0340d156c Merge "Don't overwrite accessibility delegates in AbsListView items." into jb-mr1-dev 2012-08-29 14:21:18 -07:00
John Spurlock
4e724c8423 Change default setting for dreams to 'when docked'
Bug:7078718
Change-Id: I4ec74cc9562ab728d6f86938758ede74c241c63b
2012-08-29 17:14:49 -04:00
Jim Miller
d45e5f610c Merge "Enable new keyguard" into jb-mr1-dev 2012-08-29 13:57:14 -07:00
Benoit Goby
37ce5c5d5e UsbDebuggingManager: add missing break in switch
Bug: 7079044
Change-Id: Icf4090e79af47db7d068981537c97f2028d8e405
2012-08-29 13:52:17 -07:00
Jim Miller
9c7e630e3f Enable new keyguard
Change-Id: I52af2d4f9083120616f012138a60b557a0eb70cf
2012-08-29 13:48:34 -07:00
Jean-Baptiste Queru
69626dab17 am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"
* commit '4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a':
  Make addAddress locale safe
2012-08-29 13:03:41 -07:00
Jean-Baptiste Queru
4a4edbbfce am 7fecf5f4: Merge "Make addAddress locale safe"
* commit '7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
  Make addAddress locale safe
2012-08-29 12:59:06 -07:00
Jim Miller
c134885e6f Merge "Replace keyguard with new implementation" into jb-mr1-dev 2012-08-29 12:52:09 -07:00
Jim Miller
dcb3d84b82 Replace keyguard with new implementation
This change refactors keyguard to be more modular and maintainable.  More
specifically, it replaces the top-level view with just one device-dependent
view that contains two views: a widget area and a security area.

The widget area can be populated with custom widgets.

The security area contains the current security method as dictated by
the stored password quality.

This change contains both the old and the new keyguard with the old keyguard
still enabled.  The new keyguard will be enabled in a subsequent change.

Change-Id: Id75286113771ca1407e9db182172b580f870b612
2012-08-29 12:36:26 -07:00
Jean-Baptiste Queru
7fecf5f451 Merge "Make addAddress locale safe" 2012-08-29 12:19:04 -07:00
Jean-Baptiste Queru
38f197863a am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
* commit '14c0c989d21531056a5d0a0739c3ffdd1b04b295':
  Fix SkBitmap::fPixels not being locked correctly
2012-08-29 12:00:10 -07:00
Jean-Baptiste Queru
14c0c989d2 am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
* commit '4ba4caede125ff602b0d93f577f9054a07791ff7':
  Fix SkBitmap::fPixels not being locked correctly
2012-08-29 11:55:20 -07:00
Selim Gurun
a36dcfdfe0 Provide referer to browser on download request.
Bug: 6662557

Provide a private API to provide referer to browser for download
requests.

Change-Id: I6ff393caa43e16db12fb5dab38f1f26cd76bf232
2012-08-29 11:50:55 -07:00
Jean-Baptiste Queru
4ba4caede1 Merge "Fix SkBitmap::fPixels not being locked correctly" 2012-08-29 11:27:31 -07:00
Chris Craik
a798b95a9e Use smoothstep to eliminate branches in AA shader
Change-Id: If4ecb1a9446f29b2f8444f5cee551f863c1993e8
2012-08-29 11:14:52 -07:00
Jean-Baptiste Queru
c88a80a1d7 am 15e099cc: am 0e0942c7: Merge "Default WiFi sleep policy setting"
* commit '15e099cc09589f963933f046d7267552ba3ffad8':
  Default WiFi sleep policy setting
2012-08-29 10:58:35 -07:00
Irfan Sheriff
d5a1074c4e am c5f34bd4: am 48c45d0e: Merge "Fix join scenario with provision discovery"
* commit 'c5f34bd40bc68925c6e99da02e179227d8eb3ae4':
  Fix join scenario with provision discovery
2012-08-29 10:58:30 -07:00
Jean-Baptiste Queru
15e099cc09 am 0e0942c7: Merge "Default WiFi sleep policy setting"
* commit '0e0942c7209c758bc00939ae54059dc24bce3abb':
  Default WiFi sleep policy setting
2012-08-29 10:49:25 -07:00
Irfan Sheriff
c5f34bd40b am 48c45d0e: Merge "Fix join scenario with provision discovery"
* commit '48c45d0e3bcacebfc3635bc893875146b7ecb787':
  Fix join scenario with provision discovery
2012-08-29 10:49:20 -07:00
Jean-Baptiste Queru
0e0942c720 Merge "Default WiFi sleep policy setting" 2012-08-29 09:50:45 -07:00
Irfan Sheriff
48c45d0e3b Merge "Fix join scenario with provision discovery" 2012-08-29 09:47:27 -07:00
Irfan Sheriff
127efc4e25 Fix join scenario with provision discovery
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
2012-08-29 08:36:17 -07:00
Michal Stawinski
35ef567140 Fix SkBitmap::fPixels not being locked correctly
In some cases bitmap's pixels where freed during encoding, which
caused a null pointer dereference.
This fix makes sure that underlaying buffer is locked for the whole
process of compression.

Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
2012-08-29 15:54:01 +02:00
Jeff Brown
c53abc4d42 Run with scissors.
Add a useful (if somewhat dangerous) method which will help
replace similarly dangerous code patterns in a few different places.

Change-Id: If1295f7ab9652c906ce718d94eb7914d143e1939
2012-08-29 06:15:21 -07:00
Erik Ljungberg
7e07147ece Default WiFi sleep policy setting
Creates a defult.xml setting for WiFi sleep policy.

It is now possible, through device overlays, to change
the default sleep policy to e.g. never in order to improve
user experience of WiFi.

Change-Id: Ie459b8e70fdbc7c605452fe0692d7bc26460e939
2012-08-29 09:52:12 +02:00
Johan Redestig
3cd42dfd50 Make addAddress locale safe
Using regular string concatenation to avoid unexpected
results in some locales.

Change-Id: I47dd5e174c4a2e88dc18e014002820cdbf63fcad
2012-08-29 08:07:02 +02:00
Amith Yamasani
2c577f1777 Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev 2012-08-28 22:47:45 -07:00
Amith Yamasani
4e2820c22b Fix adding live wallpaper in a second user
When the second user downloads a new wallpaper service, Wallpaper
service needs to query the correct user's package state to figure
out if it is available and bind to it.

Change-Id: Ifb95db1c859887f996f5b2e821b4b46510ee7016
2012-08-28 22:45:17 -07:00
Adam Powell
04951a51f8 Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev 2012-08-28 18:51:24 -07:00
Craig Mautner
c479b55abe Merge "Check proximity detector before powering off." into jb-mr1-dev 2012-08-28 17:16:28 -07:00
Craig Mautner
4ccbdd1770 Check proximity detector before powering off.
Do not automatically power off if the proximity detector wakelock is
active.

Fixes bug 7047455.

Change-Id: I44e30bf388292e5c476dfb5d0de9226d21853e4d
2012-08-28 17:12:52 -07:00
Amith Yamasani
7af0c166f0 Merge "Fix recents list for multiuser" into jb-mr1-dev 2012-08-28 17:02:29 -07:00