54343 Commits

Author SHA1 Message Date
Jeff Sharkey
d37948f6ed Hide NetworkStatsHistory internals.
Instead of exposing internal storage details, offer getValues()
accessor which populates values into a recycled structure.

Change-Id: I5228d7099a8f61b2018a435a813435a67dae49b4
2011-07-12 13:57:06 -07:00
Jeff Sharkey
1ea4cc6464 Merge "Return stats from inactive ifaces, packet counts." 2011-07-12 11:09:09 -07:00
Fabrice Di Meglio
eb982f3991 Merge "Fix scrolling bug causing centered cursor." 2011-07-12 09:39:18 -07:00
Ben Murdoch
a698e6a6db Merge changes I829b5d24,I521c0989
* changes:
  Add missing auto-fill strings.
  Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
2011-07-12 08:51:23 -07:00
Ben Murdoch
06da76bd2d Add missing auto-fill strings.
These strings had a defintion native side, but no corresponding
definition java side which would lead to a crash. Strings taken from
chrome/app/generated_resources.grd - see
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/generated_resources.grd?r1=75912&r2=76117&pathrev=88489

Also note that credit_card_number_preview_format is no longer needed.

See also change Ib861245e26197938bb2c5cf0f99c1d797ab0fbf2

Change-Id: I829b5d24e6f9a04211ee91c3f670c8659c004cd9
2011-07-12 14:54:40 +01:00
Ben Murdoch
bfcc595307 Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
See diff from last update here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=75368&r2=82248

Change-Id: I521c098932dfcfcb728ed2d96afd22b7926e88e9
2011-07-12 14:54:20 +01:00
Mark Brophy
622c03e6cf Merge "Expose app resume times to the ApplicationProvider." 2011-07-12 02:57:16 -07:00
satok
6df76aa9f1 Merge "Change IME picker dialog from Activity to Broadcast" 2011-07-11 22:12:59 -07:00
Mathias Agopian
e230189444 Merge "fix a weird use of Vector::appendVector()" 2011-07-11 18:30:41 -07:00
Mathias Agopian
e92963c3f9 Merge "Fix typo in an assert's log" 2011-07-11 18:30:29 -07:00
Doug Felt
25b9f42737 Fix scrolling bug causing centered cursor.
Change-Id: I792a2c4d291e2ac5f0d1ed6e74f5e2ecb395c010
2011-07-11 17:48:50 -07:00
Jamie Gennis
2d6bb33800 Merge changes I002177a6,Ibaff52fe
* changes:
  Add the EGL_ANDROID_recordable spec.
  Add the spec for EGL_ANDROID_blob_cache.
2011-07-11 17:14:33 -07:00
Jamie Gennis
8f80f152e5 Add the EGL_ANDROID_recordable spec.
Change-Id: I002177a68fafd6bb941aa64445c85fd5ff56223a
2011-07-11 17:13:02 -07:00
Robert Greenwalt
0870e81467 Merge "Fix wifi tethering." 2011-07-11 16:47:25 -07:00
Guang Zhu
5a8eccbfb9 Merge "allow Uri as intent extra in am command" 2011-07-11 16:45:35 -07:00
satok
683e2383c8 Change IME picker dialog from Activity to Broadcast
Change-Id: I4822899f34a2951d2f2a1258d1adcc7d8fccbb12
2011-07-12 08:28:52 +09:00
Mathias Agopian
198fd888ad fix a weird use of Vector::appendVector()
operator= is way more efficient.

Change-Id: I61c9adb1413bed230801a77151b8f7000fd11471
2011-07-11 16:26:36 -07:00
Mathias Agopian
cf7e3a5984 Fix typo in an assert's log
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
2011-07-11 16:26:18 -07:00
Jeff Brown
9f845cff9b Merge "Increase activity timeouts when using a wrapper process." 2011-07-11 16:00:11 -07:00
Jeff Brown
3f9dd287b9 Increase activity timeouts when using a wrapper process.
This patch enables the Zygote to tell the ActivityManager when
it has started a process with a wrapper attached so that the
ActivityManager can allow it extra time to start up or process
events.

This is useful when wrapping an app with Valgrind or other tools
which add significant runtime overhead.

Bug: 4584468
Change-Id: I5db6f2f15cd30b0ec40f547d2fadfa216de2926d
2011-07-11 15:57:15 -07:00
Mike Lockwood
801525cecc Merge "UsbDeviceManager: Include kernel USB state in dumpsys output" 2011-07-11 15:52:30 -07:00
Mike Lockwood
8f540d4d02 Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state" 2011-07-11 15:52:06 -07:00
Jason Sams
ac7f69bac3 Merge "Add error checks for AllocationAdapters being used in unsupported ways." 2011-07-11 15:47:36 -07:00
Jamie Gennis
308f9f6b24 Merge "EGL: fix the ANativeWindow size/fmt override" 2011-07-11 15:47:20 -07:00
Romain Guy
f21f07627d Merge "Always make GL calls with a valid EGL context. Bug #5010760" 2011-07-11 15:37:24 -07:00
Romain Guy
039857520b Always make GL calls with a valid EGL context.
Bug #5010760

Change-Id: If7500ef69683948e727df1406f458f18b11259d1
2011-07-11 15:33:51 -07:00
Robert Greenwalt
7c34f29c8a Fix wifi tethering.
The new link-status netlink monitor is a bit chatty and we were getting race conditions.
The wl0.1 soft-ap interface was getting created, but in the off state.  We would report
it available (link-added always reports it) causing wifi to start tethering, but then
we'd sometimes get a link-status-down notification and a link-status-up, causing wifi
to freak out with these two requests.

The simple fix was to not listen to the new link-status notifications.  This should be
redesigned in the future.
bug:4983942

Change-Id: Ica4f34d8bf2a07fc19b35a1e15283a7f8022165e
2011-07-11 15:24:43 -07:00
Mike Lockwood
6ea146c239 UsbDeviceManager: Include kernel USB state in dumpsys output
Change-Id: Ia7f015057e24f376e285a40e583644f9d0b9213e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 18:23:44 -04:00
Mike Lockwood
c264afeb55 UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state
This makes it more robust when recovering from runtime restarts

Bug: 4986841

Change-Id: I54b94213447130ca881c66da2d0ce490242f0c96
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 18:23:44 -04:00
Eric Laurent
c478f13535 Merge "Audio Effect API: process reverse stream function" 2011-07-11 15:20:27 -07:00
Daniel Lehmann
96fc8269ed Merge "Remove restricted white-listing" 2011-07-11 15:10:04 -07:00
Jaikumar Ganesh
e544a1dbc9 Merge "Query the correct Extra for BT intents." 2011-07-11 14:41:02 -07:00
Shimeng (Simon) Wang
645511b68d Merge "Set mActualScale when initialScale is set." 2011-07-11 14:40:04 -07:00
Jeff Sharkey
fd8be3e5e7 Return stats from inactive ifaces, packet counts.
When an iface goes inactive, xt_qtaguid maintains historical counters
instead of discarding.  Now reading and returning those values in
NetworkManagementService summary calls.  Tests to verify stats are
returned.

Modify NetworkStats to include rxPackets and txPackets values, and
move to Entry to eventually hide internal storage details.

Bug: 4984539
Change-Id: I1ba0bb5580c62e946d9dff2cc2a6f64aff403efc
2011-07-11 14:39:56 -07:00
Jaikumar Ganesh
0b63a6abb6 Query the correct Extra for BT intents.
The extra being queried for wrong for the CONNECTION_STATE_CHANGED
intent. Thus, the status bar icon was never getting updated.

Change-Id: I88892c3acb7cf5aecfd92524e53371a3d43cf5fd
2011-07-11 14:35:56 -07:00
Jaikumar Ganesh
5623b07497 Merge "Bluetooth Health APIs" 2011-07-11 14:17:57 -07:00
Shimeng (Simon) Wang
07ac175452 Set mActualScale when initialScale is set.
This sets mActualScale to be correct value if initialScale is set.

issue: 4982074
Change-Id: I69d12d185710e89fc91a3a6bdf566c7092f059b7
2011-07-11 14:13:17 -07:00
Jeff Brown
f25a8ce4a6 Merge "Remove more simulator support code. Bug: 5010576" 2011-07-11 13:41:26 -07:00
Adam Powell
3282703f12 Merge "New assets from UX for dialogs/menu frames" 2011-07-11 13:39:45 -07:00
Jeff Brown
501c4671e7 Merge "Eliminate single-process mode. Bug: 5010576" 2011-07-11 13:37:53 -07:00
Jeff Brown
5d6d90fac8 Remove more simulator support code.
Bug: 5010576

Change-Id: Ie6c8665306bf4e822693b76f25c3a0f05c12d42d
2011-07-11 13:33:22 -07:00
James Dong
9b40a61ce9 Merge "Do not wait for unlaunched threads in stop()" 2011-07-11 12:56:11 -07:00
James Dong
0e27fce923 Do not wait for unlaunched threads in stop()
Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
2011-07-11 12:51:21 -07:00
James Dong
6e65a4a4ff Merge "Release camera if CameraSource::start() has not been called" 2011-07-11 12:46:35 -07:00
Jamie Gennis
97eae025ad EGL: fix the ANativeWindow size/fmt override
This change fixes how the Android EGL layer overrides the size and
format of an ANativeWindow in eglCreateWindowSurface.  The new behavior
is to leave the size untouched when overriding the format.  The previous
behavior was to reset the ANativeWindow to use the default size set by
the ANativeWindow implementation.

It also adds two new 'perform' methods to the ANativeWindow interface:
set_buffers_dimensions and set_buffers_format, and redefines the
behavior of set_buffers_geometry to be the combination of these two new
methods.

Additionally, this change adds an error check for the return value of
the new native_window_set_buffers_format call, which required adding a
(stub) handler for to FramebufferNativeWindow.

Change-Id: I805c7ccd8d4730dfb132d10d8bc3fb058a0b9df1
2011-07-11 12:31:45 -07:00
Mike Lockwood
a59a1bad85 Merge "Remove unnecessary locking from MediaScanner JNI code" 2011-07-11 12:15:21 -07:00
Mike Lockwood
af16d0b30e Remove unnecessary locking from MediaScanner JNI code
There is nothing in this file that requires a global lock.
Furthermore, the lock can cause timeouts in native_finalize if one instance
is being garbage collected while another is busy in processDirectory

Bug: 5002520

Change-Id: I8717f8edeb932200d9f76b3d98915cfbe18b6ec6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 15:07:10 -04:00
Jamie Gennis
0fec106d85 Add the spec for EGL_ANDROID_blob_cache.
Change-Id: Ibaff52fee5c856283536ad37251cc80a9f3f938b
2011-07-11 12:06:54 -07:00
Adam Powell
6f76635ee0 New assets from UX for dialogs/menu frames
Change-Id: If23f37f1aadb90af175664bdd2ddc485559e6781
2011-07-11 12:06:05 -07:00
Eric Laurent
325b8e83a6 Audio Effect API: process reverse stream function
Added function to audio effect interface for processing of
a reverse stream.
This is necessary for audio pre processes like echo cancellation.

Change-Id: I6e12d79dbbed6376acdfc79304b8c0ab3f705eae
2011-07-11 12:00:53 -07:00