Commit Graph

19573 Commits

Author SHA1 Message Date
Jeff Brown
01b2e96bc2 am 184b44e7: Merge "Fix ownership of CursorWindows across processes. Bug: 5332296"
* commit '184b44e79406e5f7e4f68673277c9637c6451b55':
  Fix ownership of CursorWindows across processes. Bug: 5332296
2011-10-10 14:07:36 -07:00
Jeff Brown
184b44e794 Merge "Fix ownership of CursorWindows across processes. Bug: 5332296" 2011-10-10 14:06:09 -07:00
Derek Sollenberger
77553640e6 am 1d805c2b: Merge "Delay sending Plugin Draw event until the surface is ready."
* commit '1d805c2b90f67a394016a138995c4c1eeb855ff7':
  Delay sending Plugin Draw event until the surface is ready.
2011-10-10 13:29:57 -07:00
Derek Sollenberger
1d805c2b90 Merge "Delay sending Plugin Draw event until the surface is ready." 2011-10-10 13:28:01 -07:00
Derek Sollenberger
281432c467 Delay sending Plugin Draw event until the surface is ready.
bug: 5436630
Change-Id: Ib66859b94b60fc5ea2a8db5e2e40690a084d5b0a
2011-10-10 16:19:56 -04:00
John Reck
9c842b49aa am aa71686e: Merge "Improve loadData JavaDoc"
* commit 'aa71686e1287600cabb9d15dc1b0a72f89c04d96':
  Improve loadData JavaDoc
2011-10-10 13:08:28 -07:00
John Reck
aa71686e12 Merge "Improve loadData JavaDoc" 2011-10-10 13:06:54 -07:00
John Reck
cca606d7c3 Improve loadData JavaDoc
Bug: 5425567

Change-Id: I2feff8ac69b2bb790aec8c5f710af0df257e28fb
2011-10-10 12:55:22 -07:00
Jeff Brown
5ae0810722 am 48731318: Merge "Always log StrictMode violations on ENG builds."
* commit '4873131858a78708d42ffbdae0753c1bcd04d46f':
  Always log StrictMode violations on ENG builds.
2011-10-10 11:51:34 -07:00
Jeff Brown
10628ccc66 am 222b92a7: Merge "Implement CloseGuard in ContentResolver."
* commit '222b92a7322346e544188ca040bef1e27ab2b71a':
  Implement CloseGuard in ContentResolver.
2011-10-10 11:51:33 -07:00
Jeff Brown
f2569eeee3 am 326e8748: Merge "Clean up handrolled Binder proxies. Bug: 5332296"
* commit '326e8748f082f3c794fcfcd7c87c688a0564a964':
  Clean up handrolled Binder proxies. Bug: 5332296
2011-10-10 11:51:32 -07:00
Jeff Brown
4873131858 Merge "Always log StrictMode violations on ENG builds." 2011-10-10 11:48:53 -07:00
Jeff Brown
222b92a732 Merge "Implement CloseGuard in ContentResolver." 2011-10-10 11:48:49 -07:00
Jeff Brown
326e8748f0 Merge "Clean up handrolled Binder proxies. Bug: 5332296" 2011-10-10 11:48:39 -07:00
Gilles Debunne
69b36766b8 am 59ba2b2f: Merge "Bug 5250788: LatinIME slows down as amount of Text increases"
* commit '59ba2b2fabf91af7685f3c00eea7fc155d05f1fc':
  Bug 5250788: LatinIME slows down as amount of Text increases
2011-10-10 10:56:02 -07:00
Gilles Debunne
59ba2b2fab Merge "Bug 5250788: LatinIME slows down as amount of Text increases" 2011-10-10 10:54:51 -07:00
Steve Block
17283fbfac am b19c7878: Improve documentation for WebView.loadUrl() to specify charset
* commit 'b19c7878cc48746b7dda7ebdf1c85f6a7e6996a3':
  Improve documentation for WebView.loadUrl() to specify charset
2011-10-10 09:05:16 -07:00
Steve Block
b19c7878cc Improve documentation for WebView.loadUrl() to specify charset
Bug: 5435233
Change-Id: I69a8e0c551b58f284cfa95dccfc0ea49b0bbf05f
2011-10-10 16:57:05 +01:00
satok
e3e608cb4c am bdb3df82: Merge "Add a hidden flag for the auto correction indicator in SuggestionSpan"
* commit 'bdb3df82bb800de6f86de6b5bb2a4d29e09b3383':
  Add a hidden flag for the auto correction indicator in SuggestionSpan
2011-10-10 01:16:19 -07:00
satok
bdb3df82bb Merge "Add a hidden flag for the auto correction indicator in SuggestionSpan" 2011-10-10 01:08:27 -07:00
satok
9ca4b4377c Add a hidden flag for the auto correction indicator in SuggestionSpan
Bug: 5245468

Change-Id: Ic111554da86fefd47dd9a26c1bd41e4ee57dc552
2011-10-10 16:38:33 +09:00
Jeff Brown
d2183654e0 Fix ownership of CursorWindows across processes.
Bug: 5332296

Ensure that there is always an owner for each CursorWindow
and that references to each window are acquired/released
appropriately at all times.

Added synchronization to CursorToBulkCursorAdaptor to
prevent the underlying Cursor and CursorWindow from being
remotely accessed in ways that might violate invariants,
resulting in leaks or other problems.

Ensured that CursorToBulkCursorAdaptor promptly releases
its references to the Cursor and CursorWindow when closed
so they don't stick around longer than they should, even
if the remote end hangs onto the IBulkCursor for some reason.

CursorWindow respects Parcelable.FLAG_WRITE_RETURN_VALUE
as an indication that one reference to the CursorWindow is
being released.  Correspondingly, CursorToBulkCursorAdaptor
acquires a reference to the CursorWindow before returning
it to the caller.  This change also prevents races from
resulting in the transfer of an invalid CursorWindow over
the wire.

Ensured that BulkCursorToCursorAdaptor promptly releases
its reference to the IBulkCursor when closed and throws
on attempts to access the cursor while closed.

Modified ContentProviderNative to handle both parts of
the wrapping and unwrapping of Cursors into IBulkCursors.
This makes it a lot easier to ensure that the right
things happen on both ends.  Also, it turns out that
the only caller of IContentProvider.bulkQuery was
ContentProviderNative itself so there was no need
to support bulkQuery on ContentProviderProxy and it was
just getting in the way.

Implement CloseGuard on CursorWindow.

Change-Id: Ib3c8305d3cc62322f38a06698d404a2989bb6ef9
2011-10-09 22:10:36 -07:00
Dianne Hackborn
d1270cee86 am f6497e45: Merge "Calling close() outside of the main thread breaks stuff."
* commit 'f6497e45fae88788b1c67d815458355a1f2f65b5':
  Calling close() outside of the main thread breaks stuff.
2011-10-09 17:16:15 -07:00
Dianne Hackborn
f6497e45fa Merge "Calling close() outside of the main thread breaks stuff." 2011-10-09 17:14:49 -07:00
Jeff Sharkey
1825da11a9 am d78a38ca: Merge "Move battery stats to xt_qtaguid for data stats."
* commit 'd78a38cae2f041629326d475333f43fd81ae4137':
  Move battery stats to xt_qtaguid for data stats.
2011-10-09 17:10:15 -07:00
Jeff Sharkey
d78a38cae2 Merge "Move battery stats to xt_qtaguid for data stats." 2011-10-09 17:08:23 -07:00
Dianne Hackborn
229edbc38d Calling close() outside of the main thread breaks stuff.
Too dangerous to fix at this point.

Change-Id: I7de5bfecd757fbae635b02c2c2d9ba7ce3bcb435
2011-10-09 16:01:40 -07:00
Jeff Brown
d5875d98f0 Always log StrictMode violations on ENG builds.
The drop-box is too quiet and it masking real problems from
developers.  On ENG builds, use both logging and the drop-box
to ensure that problems are noticed promptly.

Change-Id: Id8fb8d392a7e01b532b73cb1a026b0d1f17af742
2011-10-09 15:01:11 -07:00
Jeff Brown
baaf8c3f55 Implement CloseGuard in ContentResolver.
Also, don't try to close the cursor from the finalizer,
it just won't work because quite probably the Binder underneath
it has already been finalized or is about to be.

Change-Id: I6363cd30f32abe15412948d126e0bcc5f62943c5
2011-10-09 15:01:10 -07:00
Dianne Hackborn
59ce1f3d7c am 43ee0ab8: Fix issue #5433910: RTE while adding an account from settings
* commit '43ee0ab8777632cf171b598153fc2c427586d332':
  Fix issue #5433910: RTE while adding an account from settings
2011-10-09 14:24:39 -07:00
Dianne Hackborn
43ee0ab877 Fix issue #5433910: RTE while adding an account from settings
Make the new marshalling/unmarshalling code for the long sparse
array of ints always consistent.

And sane.

Change-Id: Ifbfbe6e56f59e469acb66257c504b1168d6566fa
2011-10-09 14:11:05 -07:00
Jeff Sharkey
1059c3c30a Move battery stats to xt_qtaguid for data stats.
Replace TrafficStats calls by reading values from xt_qtaguid kernel
module. To keep BatteryStatsImpl changes lightweight, cache recently
parsed stats. Tracks mobile ifaces from ConnectivityService.

Refactor xt_qtaguid parsing into factory outside of NMS. Add stats
grouping based on UID, and total based on limiting filters like iface
prefix and UID.

Bug: 4902271
Change-Id: I533f116c434b77f93355bf95b839e7478528505b
2011-10-09 13:49:08 -07:00
Dianne Hackborn
e74f480bd1 am 421fa274: Fix issue #5418999: [From My Phone] - ANR when navigating back from OneUp view
* commit '421fa2744556d6483007bc2a6a1e4030811142f9':
  Fix issue #5418999: [From My Phone] - ANR when navigating back from OneUp view
2011-10-09 13:13:36 -07:00
Jeff Brown
df6611d8c0 Clean up handrolled Binder proxies.
Bug: 5332296

We can't replace these with AIDL generated proxies just yet, but
at least we can make them a little more conformant.

Change-Id: I1814f76d0f9c5e44a7fd85a12b2e3c2b7e3c9daa
2011-10-09 13:00:35 -07:00
Dianne Hackborn
421fa27445 Fix issue #5418999: [From My Phone] - ANR when navigating back from OneUp view
Close cursors asynchronously.

Change-Id: I32c106d26c0443710789344bf823c288eaf31db5
2011-10-09 12:50:45 -07:00
Costin Manolache
db582d17a2 am 6d288bd2: Merge "b/5399355 StringIndexOutOfBoundsException from AccountManagerService"
* commit '6d288bd2f3596ce268a3a3278f005d8757c79d63':
  b/5399355 StringIndexOutOfBoundsException from AccountManagerService
2011-10-07 17:56:05 -07:00
Costin Manolache
6d288bd2f3 Merge "b/5399355 StringIndexOutOfBoundsException from AccountManagerService" 2011-10-07 17:54:05 -07:00
Dianne Hackborn
be870e81e8 am ba8ecd20: Merge "Fix how we hide and show the nav bar."
* commit 'ba8ecd206cc6f175767f952d380c88f70ece04cf':
  Fix how we hide and show the nav bar.
2011-10-07 15:14:55 -07:00
Dianne Hackborn
ba8ecd206c Merge "Fix how we hide and show the nav bar." 2011-10-07 15:12:17 -07:00
Jeff Brown
f27eeeb28b am 270928bd: Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78
* commit '270928bd4a1db1dc0d989f4e9897a81ab865e30e':
  Fix regression in CursorWindow.getString() Bug: 5332296
  Clean up CursorWindow lifetime. Bug: 5332296
  Fix regression in CursorWindow.copyStingToBuffer. Bug: 5332296
2011-10-07 15:09:29 -07:00
Michael Kolb
d4fd84dabc am b762d1e5: Merge "Handle audio focus in HTML5 audio"
* commit 'b762d1e5eaae9f04f1141feaa402e3f8939d28cc':
  Handle audio focus in HTML5 audio
2011-10-07 15:09:24 -07:00
Jeff Brown
270928bd4a Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78
* changes:
  Fix regression in CursorWindow.getString() Bug: 5332296
  Clean up CursorWindow lifetime. Bug: 5332296
  Fix regression in CursorWindow.copyStingToBuffer. Bug: 5332296
2011-10-07 15:08:24 -07:00
Michael Kolb
b762d1e5ea Merge "Handle audio focus in HTML5 audio" 2011-10-07 15:07:29 -07:00
Dianne Hackborn
df89e65bf0 Fix how we hide and show the nav bar.
The PhoneWindowManager is now responsible for hiding and showing
the nav bar.

For hiding, it just moves it off the screen (easy way to get a
nice slide animation on and off).  At the same time, we use a
new WM facility to put up a fake input window to capture all
touch events.

When a touch event is received, we force the system UI to clear
the navigation hiding bit so it will be shown again.

This removes a bunch of code from the system UI for hiding and
showing the nav bar.  Also removes the code calling from userActivity()
to the system UI, which was bad.  (Also no longer using userActivity()
fixes bugs around re-showing the nav bar due to key presses and
other wrong things.)

Change-Id: I8c3174873b5bcaa36a92322a51e8f7993e88e551
2011-10-07 14:32:01 -07:00
Michael Kolb
889453b892 Handle audio focus in HTML5 audio
Bug: 5416191

    Video will follow later

Change-Id: I51da05aa0e3c8c0f33151df84d84a65cb7003080
2011-10-07 14:22:29 -07:00
Christopher Tate
b317fde4a1 am e47b89ca: Merge "Fix wallpaper restore"
* commit 'e47b89cabe38bb0a711c3b2a87be9696c7a1f074':
  Fix wallpaper restore
2011-10-07 13:38:37 -07:00
Christopher Tate
e47b89cabe Merge "Fix wallpaper restore" 2011-10-07 13:36:09 -07:00
Jeff Brown
7ce745248d Clean up CursorWindow lifetime.
Bug: 5332296

Removed dead code in SQLiteCursor related to the use of a background
query thread.  This code could result in CursorWindows being modified
concurrently or used after free.  This code is broken, unused and
is just in the way.

Added comments to explain how CursorWindow ownership is
supposed to work for AbstractWindowedCursors.  (There are still cases
where cursor windows get dropped on the floor without being closed.
Those will be taken care of in a subsequent patch.)

Cleaned up SQLiteQuery.fillWindow to eliminate duplicate code and
remove bits that were only needed for background loading, like
returning -1.

Change-Id: I03e8e2e73ff0c11df76d63f57df4c5ada06ae1cb
2011-10-07 13:31:00 -07:00
John Reck
4a1ad5c1ea am 25d888b5: Merge "Fix calc visible to account for action bar"
* commit '25d888b5ff23acf1a9d41bef3e74ee897baf5ad7':
  Fix calc visible to account for action bar
2011-10-07 13:28:33 -07:00
Matthew Xie
035d25170d am cf6bc99b: Merge "Turn off debug messge"
* commit 'cf6bc99b97d398c13bbf7a2d8656670f197d8220':
  Turn off debug messge
2011-10-07 13:28:27 -07:00