67806 Commits

Author SHA1 Message Date
Steve Block
ede54886f7 Merge "Fix CacheManager.getCacheFile() with the Chromium HTTP stack" 2012-02-21 07:43:07 -08:00
Glenn Kasten
06d91936eb Merge "createSurface getpid() first parameter was removed" 2012-02-21 07:24:16 -08:00
Steve Block
ffefba15e3 Fix CacheManager.getCacheFile() with the Chromium HTTP stack
We need to populate the headers map with both the Android and Chromium HTTP
stacks.

Change-Id: I2df0aa2fce917ad43a1cac1426a324e49b2950f9
2012-02-21 14:19:15 +00:00
Steve Block
2601dccdc0 Merge "Don't try to use Network timing with the Chromium HTTP stack" 2012-02-21 03:52:02 -08:00
Steve Block
35067317a4 Merge "Clean up JavaDoc for WebResourceResponse" 2012-02-21 03:51:47 -08:00
Steve Block
acd7e2eb8b Don't try to use Network timing with the Chromium HTTP stack
Change-Id: Ibba20a13e1389c2a7b1cc0cc45d3ef012894cb99
2012-02-21 10:21:40 +00:00
Steve Block
938d2fbc57 Clean up JavaDoc for WebResourceResponse
Clean-up only, no functional change.

Bug: 5461416
Change-Id: Iec37d5f67674b0fb9b5521c179773b7d09a3985c
2012-02-21 10:21:37 +00:00
Steve Block
e5602e057e Merge "Clean up JavaDoc for CookieManager" 2012-02-21 02:18:12 -08:00
Steve Block
77db999077 Clean up JavaDoc for CookieManager
Also fix naming of CookieManager.pendingCookieOperations.

Clean-up only, no functional change.

Bug: 5461416
Change-Id: Ia129c4535b8ef6a5a314e588c34ee6db2fe5b386
2012-02-21 10:15:34 +00:00
Steve Block
28e0390da2 Merge "Make LoadListener.willLoadFromCache() private" 2012-02-21 02:09:34 -08:00
Steve Block
b1affa1747 Make LoadListener.willLoadFromCache() private
This is only called only via JNI. Clean-up only, no functional change.

Change-Id: I8d4ef85ac7634333b3b2283ff12afd7b6a99095f
2012-02-21 10:07:27 +00:00
Mathias Agopian
7c536831d0 Merge "SurfaceFlinger: set wrap mode on screenshot texture" 2012-02-20 22:50:36 -08:00
Todd Poynor
94d0024557 Power HAL PowerManagerService hookup
Use PowerHAL to set system awake/suspend state.

Change-Id: If58a6f548564ea141b68f304455997d9ff04eace
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-02-17 22:19:45 -08:00
Mathias Agopian
4e753e08d1 Merge "frameworks/base refactoring." 2012-02-17 19:26:39 -08:00
Mathias Agopian
b13b9bdad2 frameworks/base refactoring.
step 2: move libutils headers to their new home: androidfw

Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
2012-02-17 19:01:26 -08:00
Romain Guy
e8585b1721 Correctly offset the dirty bounds by 0.5px in every direction
The existing code was behaving differently for the leaf view and its parents.

Change-Id: I14c1ce5cc149ff840ad957408d6a41bbb4137264
2012-02-17 18:31:31 -08:00
Jason Sams
6db0608dff Merge "Work around VSync signal while screen is off." 2012-02-17 17:20:27 -08:00
Adam Powell
9ffcbcc1f8 Merge "Add transient state tracking to Views" 2012-02-17 17:15:04 -08:00
Jason Sams
f7795e0c2f Work around VSync signal while screen is off.
Change-Id: I0a9637170ee658ff84a363e91c558892dce5cfaf
2012-02-17 17:00:37 -08:00
Jeff Brown
5bf842b22e Fix build break.
Change-Id: I0bc8ac6e76ff28bd4c3585afbd6b3aa1930bf710
2012-02-17 16:56:59 -08:00
Adam Powell
539ee8716b Add transient state tracking to Views
Transient state is temporary bookkeeping that Views need to perform
that the app should not need to be aware of. Examples include text
selection regions and animation state.

Transient state is a problem for AdapterViews like ListView that do
view recycling. Unless the app takes responsibility for tracking and
restoring transient state as if it were a part of the adapter's data
set, it cannot correctly recycle views. Selections disappear when an
EditText is scrolled out of sight and animations seem to play on the
wrong views.

Views can now flag themselves as having transient state. (As the name
implies, this should be a temporary condition.) If a ViewGroup
contains a child with transient state, that ViewGroup also has
transient state.

AbsListView's recycler now tracks views with transient state
separately. Views with transient state will be retained, and until a
data set change occurs the same view will be reused for that position
instead of calling the adapter's getView() method.

The API to set and check transient state is currently hidden.

Change-Id: Idfd8eaac2c548337686d8d9f98fda4c64be5b8a0
2012-02-17 16:40:24 -08:00
Jeff Brown
4a7571bc0b Merge "frameworks/base refactoring." 2012-02-17 16:28:20 -08:00
Mathias Agopian
b93a03f841 frameworks/base refactoring.
First step. Move libui includes to their new home: androidfw.

Change-Id: Ic042b52fdba72f30edc3cc6339bf30b4c1b99662
2012-02-17 15:36:10 -08:00
Romain Guy
6917e6550d Merge "Record possible clip rejects when recording display lists" 2012-02-17 15:18:14 -08:00
Siva Velusamy
7d5bb3ddf3 Merge "gltrace: Trace thread time and wall clock time." 2012-02-17 15:05:36 -08:00
Iliyan Malchev
95221b51e4 Merge "libs/utils: replace malloc() + memset() to zero with calloc()" 2012-02-17 14:51:32 -08:00
Mike Lockwood
18ce4566d3 Merge "Revert "Revert "The com.android.athome api classes are moving android.support.place.""" 2012-02-17 14:33:27 -08:00
Iliyan Malchev
d7a3aa452c Merge "bluetooth: replace malloc() + memset() to zero with calloc()" 2012-02-17 14:28:38 -08:00
Iliyan Malchev
7e1d395686 libs/utils: replace malloc() + memset() to zero with calloc()
Change-Id: I8bdf4360147e51e35c162856c9a859aed6acac34
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-02-17 14:27:13 -08:00
Iliyan Malchev
8d25cb8a64 bluetooth: replace malloc() + memset() to zero with calloc()
Change-Id: I86b0ee4babc79189184b09c51757ec1162517c7b
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-02-17 14:27:13 -08:00
Romain Guy
33f6beb10f Record possible clip rejects when recording display lists
This optimization allows us to quickly skip operations that lie
entirely outside of the known bounds of a display list. Because
of ViewGroup.setClipChildren, we must keep the operations recorded
in the display list. setClipChildren(false) is however a very
uncommon operation and we will therefore often benefit from this
new optimization.

Change-Id: I0942c864e55298e6dccd9977d15adefbce3ba3ad
2012-02-17 13:10:00 -08:00
Romain Guy
e97df97b6c Merge "Remove unused private APIs" 2012-02-17 13:09:19 -08:00
Romain Guy
97eda365fc Remove unused private APIs
Change-Id: Ib22005c7ed9923120089a1f1c806bca55bb90967
2012-02-17 13:08:35 -08:00
Eric Fischer
e4895352d3 Merge "Import translations." 2012-02-17 12:18:44 -08:00
Eric Fischer
bd9c5f7687 Import translations.
Change-Id: Ibe6f792ad6e88dfbfd6d523dfe4f24e8e93f4066
2012-02-17 12:15:19 -08:00
Jason Sams
42a23efa85 Merge "Update prototype remote fifo. Tested primary connection using only fifo data transport." 2012-02-17 12:05:13 -08:00
Jason Sams
e158f203d2 Merge "Rename three header files to free namespace for api." 2012-02-17 12:04:20 -08:00
Siva Velusamy
3b4f3748f4 gltrace: Trace thread time and wall clock time.
For each gl function, trace both the thread and wall clock
times.

Change-Id: I32b6caa67fa50bf915dab89b3c5021ee82e28d55
2012-02-17 11:09:47 -08:00
Glenn Kasten
c35761e15c Merge "Remove bit fields to improve performance" 2012-02-17 10:45:02 -08:00
Mike Lockwood
17a452f00c Revert "Revert "The com.android.athome api classes are moving android.support.place.""
This reverts commit 9dede89795a88268ab735a1b28e628f2a77922fe.
2012-02-17 10:38:00 -08:00
Jeff Brown
ba217ef207 Merge "Ignore broken input channel when finishing input event." 2012-02-17 10:30:50 -08:00
Jeff Brown
9806a2307f Ignore broken input channel when finishing input event.
There are occasional races during application shut down where the
input dispatcher will close an input channel before the application
has finished its last event.  So just ignore EPIPE.

Also tweak the logging for failed input event injection to make
it clearer which pid was trying to perform the injection.

Bug: 6013004
Change-Id: I7bbb01441d41762b03eafd4d39dcf0323e1cadf3
2012-02-17 10:28:09 -08:00
Philip Milne
580d079101 Merge "Fix remaining issue with bug #5904777" 2012-02-17 10:06:47 -08:00
Mike Lockwood
abfac6a559 Merge "Revert "The com.android.athome api classes are moving android.support.place."" 2012-02-17 09:53:30 -08:00
Mike Lockwood
9dede89795 Revert "The com.android.athome api classes are moving android.support.place."
to fix the build

This reverts commit 1aeecce8e9fe2749d1ad7ec86e40fe5a892f8f05
2012-02-17 09:53:17 -08:00
Mike Lockwood
51723c821a Merge "New clock sync control loop." 2012-02-17 09:47:47 -08:00
Kent Ryhorchuk
11bc45fcba New clock sync control loop.
Change clock sync control to velicity form PI loop. Tuned for office LAN and
WiFi conditions, will probably perform better in clean environments.
Improve packet filtering to prevent clock sync on bad rtt.
Changed diag interface to take rtt times, P, I, D are no longer supported.

Change-Id: Iad2b26eb44cd222ec5f219b49669e2d6baec9d1c
2012-02-17 09:46:37 -08:00
Glenn Kasten
4f22c05eac Remove bit fields to improve performance
uint16_t enabled is (mostly) changed to bool in a separate CL

Change-Id: Ied9f8c034b2479cee9a8778cee7b8ff92ae75b7b
2012-02-17 09:41:56 -08:00
Glenn Kasten
e13ac73a38 Merge "Simplify code" 2012-02-17 09:40:43 -08:00
Glenn Kasten
7d3be3a3c1 Simplify code
Use DefaultKeyedVector::valueFor to avoid extra test
Make local variables as local as possible
No double parentheses
No typedef for single use
No parentheses around indirect function call
No AudioFlinger:: prefix when not needed
Remove unnecessary casts
Remove block with only one line

Saves 128 bytes

Change-Id: I3a87430eeb01b81e7b81a1c38f6fdd3274ec48f3
2012-02-17 09:39:07 -08:00