84182 Commits

Author SHA1 Message Date
Amith Yamasani
9e8d101aa4 am 694121c4: Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev
* commit '694121c4004e80deec71736481cfb03bd50e38f5':
  Fix an NPE in PackageManager when getting the AppInfo for an app
2012-08-29 18:54:23 -07:00
Amith Yamasani
694121c400 Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev 2012-08-29 18:52:14 -07:00
Amith Yamasani
317046a087 Fix an NPE in PackageManager when getting the AppInfo for an app
Bug: 7072043
Change-Id: I37378b13820152434e7b3249e13c27001fe4ae5a
2012-08-29 18:48:08 -07:00
Jake Hamby
223d699d24 am c452a40e: am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp
* commit 'c452a40eea5a8bc23b05201e70a9ca740ee9ceec':
  Fix CDMA decoding of multipart UTF-16 SMS messages.
2012-08-29 18:21:20 -07:00
Jake Hamby
c452a40eea am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp
* commit '044a9b97b01a934e6cd9ef2f2914d401c4fa145b':
  Fix CDMA decoding of multipart UTF-16 SMS messages.
2012-08-29 18:19:04 -07:00
Dianne Hackborn
0322498e05 am 12631ec3: Merge "Start implementing concept of "running" users." into jb-mr1-dev
* commit '12631ec35eafc466e0deef315daa5fdfb5066372':
  Start implementing concept of "running" users.
2012-08-29 18:17:41 -07:00
Dianne Hackborn
12631ec35e Merge "Start implementing concept of "running" users." into jb-mr1-dev 2012-08-29 18:15:07 -07:00
Jake Hamby
044a9b97b0 resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp
Change-Id: Idec590dbd9e051a3faeded1af9eb4a78216f0496
2012-08-29 18:09:29 -07:00
Benoit Goby
4c0087ff61 am ffc45b7d: Merge "UsbDebuggingManager: Fix restart when toggling USB debugging" into jb-mr1-dev
* commit 'ffc45b7d5708e706aeb19454c5172136761d214b':
  UsbDebuggingManager: Fix restart when toggling USB debugging
2012-08-29 17:08:00 -07:00
Benoit Goby
ffc45b7d57 Merge "UsbDebuggingManager: Fix restart when toggling USB debugging" into jb-mr1-dev 2012-08-29 17:05:26 -07:00
Jeff Brown
ae9eb7c05c am f404d102: Merge "Fix build for some javac compilers." into jb-mr1-dev
* commit 'f404d10225a2df60eb118089f8f0e72ab5845d48':
  Fix build for some javac compilers.
2012-08-29 17:03:14 -07:00
Jim Miller
4faf923397 am 5a05f2bf: Merge "Fix MENU key in keyguard." into jb-mr1-dev
* commit '5a05f2bf22954fdbd294bca8adc2b8ef0e8c5e00':
  Fix MENU key in keyguard.
2012-08-29 17:01:39 -07:00
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
ba118c25fb am 9e3045c7: Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev
* commit '9e3045c75c80d859dd16087e69f5bfbe15ca8bf4':
  Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
2012-08-29 16:32:21 -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
Irfan Sheriff
5df5e7da51 am a28c18fc: Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev
* commit 'a28c18fc618e4bf58da6417166b1ee249dc16ea9':
  Fix DHCP handling at disconnect/reconnect
2012-08-29 15:57:58 -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
339d48d5d6 am 402206b6: Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev
* commit '402206b6e25af5d9e103cae215048c7a41d68d39':
  Use smoothstep to eliminate branches in AA shader
2012-08-29 15:55:11 -07:00
John Spurlock
1f2e9b5924 am b2c94ec8: Merge "Change default setting for dreams to \'when docked\'" into jb-mr1-dev
* commit 'b2c94ec893578dd95cac81b43726829503f29d47':
  Change default setting for dreams to 'when docked'
2012-08-29 15:55:08 -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
f1b88ab27d am d5ea3b46: Merge "Add initial multi-display support." into jb-mr1-dev
* commit 'd5ea3b464795d4e6adbdd174d1bd2f78b628e280':
  Add initial multi-display support.
2012-08-29 15:46:47 -07:00
Benoit Goby
375b80fc90 am 0552cbcf: Merge "UsbDebuggingManager: add missing break in switch" into jb-mr1-dev
* commit '0552cbcf29f266f608e8326bc467b6afb13b7f3a':
  UsbDebuggingManager: add missing break in switch
2012-08-29 15:44:54 -07:00
Jeff Brown
16e64d1ac6 am 731b8996: Merge "Run with scissors." into jb-mr1-dev
* commit '731b8996eaa7e45b206273d4691506069229449a':
  Run with scissors.
2012-08-29 15:44:51 -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
3b82c5de7f am 8506ce1a: Merge "Provide referer to browser on download request." into jb-mr1-dev
* commit '8506ce1a3f427d4c3495d6ec13c1b644aa4701fe':
  Provide referer to browser on download request.
2012-08-29 15:41:36 -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
5954d97c9c am f0340d15: Merge "Don\'t overwrite accessibility delegates in AbsListView items." into jb-mr1-dev
* commit 'f0340d156c9adf974cba36e806049f66e111fab7':
  Don't overwrite accessibility delegates in AbsListView items.
2012-08-29 14:24:20 -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
99a97d5263 am d45e5f61: Merge "Enable new keyguard" into jb-mr1-dev
* commit 'd45e5f610ca976cf5a56ce12ba18b39497243fe3':
  Enable new keyguard
2012-08-29 13:59:37 -07: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
959c05a122 am 69626dab: am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"
* commit '69626dab17f9e059cfa2e8c3ce4ec9aaa5f9853e':
  Make addAddress locale safe
2012-08-29 13:06:08 -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
8897b4f530 am c134885e: Merge "Replace keyguard with new implementation" into jb-mr1-dev
* commit 'c134885e6f2aae3a2af446623be9f195c2713bc4':
  Replace keyguard with new implementation
2012-08-29 12:55:11 -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