Merge commit '705a2df97c51c3e31ed36831a4302d705e0532b2'
* commit '705a2df97c51c3e31ed36831a4302d705e0532b2':
Remove memory monitoring from the system watchdog
Merge commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb'
* commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb':
Verify hostname where possible, and clarify where not.
Merge commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08' into gingerbread-plus-aosp
* commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08':
Remove memory monitoring from the system watchdog
Merge commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e' into gingerbread-plus-aosp
* commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e':
Improved graphics for the intruder alert.
Merge commit '24c737ccdd64475178d53677f90a300fcfbab79f' into gingerbread-plus-aosp
* commit '24c737ccdd64475178d53677f90a300fcfbab79f':
Verify hostname where possible, and clarify where not.
This was originally written as an in-case-we-need-it facility, but was
never actually used in production. It also soaked up a surprising amount
of cpu on occasion, as well as doing sketchy things like demoting the
system_server's primary looper thread to the background cgroup at times.
Change-Id: I9a81a8d1e9caea9e0a1277d97785fe96add438d7
Merge commit 'd581484ef8fac80c15ebf652e66f918374df5109' into gingerbread
* commit 'd581484ef8fac80c15ebf652e66f918374df5109':
Verify hostname where possible, and clarify where not.
The native code now maintains a list of all keys that may use
default handling. If the app finishes one of these keys
without handling it, the key will be passed back off to Java
for default treatment.
Change-Id: I6a842a0d728eeafa4de7142fae573f8c11099e18
Merge commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94'
* commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94':
Extend unit test framework for Wifi soft AP configuration
Merge commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a' into gingerbread-plus-aosp
* commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a':
Extend unit test framework for Wifi soft AP configuration
has marked itself as being an installable web app. Default implementation
in the WebChromeClient does nothing.
Requires an external/webkit change.
b/2766917
Change-Id: I7aae1b097f866e3d1c6c6a7a31a55bb12ff6a441
Merge commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84' into gingerbread-plus-aosp
* commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84':
Make android.hardware.action.USB_STATE a protected broadcast.
Merge commit 'b54ef61434eb82a53d8c840d86d1d656215604f9' into gingerbread-plus-aosp
* commit 'b54ef61434eb82a53d8c840d86d1d656215604f9':
Separate the status bar height from the icon size.
Our use of web settings does not specify the maximum image size,
although we have some hard-coded values used when decoding the
image. For defective images, the hard-coded values are not enough,
since we may exceed memory in the decoder before the limit is
reached.
Pass along our limits to the decoder, and respect any limits
set by the caller.
companion change in external/webkit
Change-Id: Iabd78165390dddce917f637bd3263b83f9b4aa56
http://b/2689053
Merge commit '9be487ce6be705d210d42f8cbe6468226eeb544e'
* commit '9be487ce6be705d210d42f8cbe6468226eeb544e':
Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
Merge commit '606d591afee24e31e3885a7330638893db1710f5' into gingerbread-plus-aosp
* commit '606d591afee24e31e3885a7330638893db1710f5':
Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
