59492 Commits

Author SHA1 Message Date
Amith Yamasani
fce776c21e Backup owner info as part of settings backup.
Added these settings to the whitelist:
Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED
Settings.Secure.LOCK_SCREEN_OWNER_INFO

Bug: 5342797
Change-Id: I1bd4d04b5651b61919efd8c1b25c04acc5806f4a
2011-10-11 13:53:30 -07:00
The Android Open Source Project
b6eb58ef03 Reconcile with ics-factoryrom-release
Change-Id: I8642724549283dbcd3d104a35d5c659e5591682e
2011-10-10 15:39:42 -07:00
Romain Guy
b47232b4d5 Merge "Don't call saveLayer() when it's not required Bug #5435653" 2011-10-10 15:24:06 -07:00
Romain Guy
098ffcd521 Don't call saveLayer() when it's not required
Bug #5435653

saveLayer() can be extremely expensive on some GPU architectures. Avoiding
this call greatly improve the rendering performance of drawables with
strok + fill.

Change-Id: Ib414174ba05d5bad56d942b8e67ab784e7d60b9e
2011-10-10 15:23:32 -07:00
James Dong
50c31024e3 Merge "Support AMR as a file type so that it can be imported into movie studio" 2011-10-10 15:22:04 -07:00
Gilles Debunne
737f33091f Merge "Bug 5437846: Crash in SpellChecker" 2011-10-10 15:18:35 -07:00
Gilles Debunne
f656030a86 Bug 5437846: Crash in SpellChecker
The cached mText field from TextView is not constant overtime.
It is especially changed whne the first character of text is added.
Retrieve the actual current value everytime we use it.

Change-Id: Ie297a3292106879621e54a22e5d03444d442ec96
2011-10-10 15:04:54 -07:00
Justin Ho
8c3e707999 am 832c5485: Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom
* commit '832c54857519c405d7aa0d3bccfe74078f1a1abf':
  Update screen lock/unlock sound Bug: 5416299
2011-10-10 14:43:35 -07:00
Justin Ho
17b8bd12f4 am 17249d64: Adding Pollux notification tone Bug: 5416299
* commit '17249d6472b85e669c1b854fc413888e78af6def':
  Adding Pollux notification tone Bug: 5416299
2011-10-10 14:43:33 -07:00
Amith Yamasani
015a8224eb am 9e7caa0b: Tie the lockscreen sounds with the ringer volume.
* commit '9e7caa0b270f8cea1fd2a61c5bffcf0df1037970':
  Tie the lockscreen sounds with the ringer volume.
2011-10-10 14:37:25 -07:00
Marco Nelissen
61cfda7e78 am 803ce0f9: (-s ours) Use SoundPool instead of Ringtone.
* commit '803ce0f9fdd455dc4ec0c6ad9c141c76315fd4da':
  Use SoundPool instead of Ringtone.
2011-10-10 14:37:23 -07:00
Romain Guy
1e43657ca0 Merge "Make sure we have the correct GL context when grabbing a bitmap Bug #5427391" 2011-10-10 14:07:10 -07:00
Jeff Brown
184b44e794 Merge "Fix ownership of CursorWindows across processes. Bug: 5332296" 2011-10-10 14:06:09 -07:00
Romain Guy
589b0bb6ab Make sure we have the correct GL context when grabbing a bitmap
Bug #5427391

Change-Id: I4687a6a3e8968fc3ca8ef171833b2bb7afc16f89
2011-10-10 13:57:47 -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
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
Andreas Huber
a5da78f09d Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater" 2011-10-10 12:45:02 -07:00
Andreas Huber
7f3259403d YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater
through the use of pseudo http headers specified in the setDataSource call.

x-cache-config: -1/-1/0
x-disconnect-at-highwatermark: 1

turns off keep-alives and disconnects every time the cache is full (will attempt
to reconnect once it run below lowwater mark)

related-to-bug: 5433309

Change-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1
2011-10-10 12:41:21 -07:00
Mathias Agopian
5872a7758b Merge "enable EGL_IMG_context_priority for the omap4 platform" 2011-10-10 12:38:16 -07:00
Jeff Brown
9e076a61e5 Merge "Fix Cursor leak in SettingsBackupAgent. Bug: 5434060" 2011-10-10 11:48:58 -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
Adam Powell
9dcd5afabe Merge "Bug 5430909 - Overlay action bar should consume hover events" 2011-10-10 11:19:35 -07:00
Adam Powell
7d09f04363 Bug 5430909 - Overlay action bar should consume hover events
Otherwise these will incorrectly fall through to the view below.

Change-Id: I97280c41b2080f3f156554c6eb111af246e140d0
2011-10-10 11:15:56 -07:00
Gilles Debunne
59ba2b2fab Merge "Bug 5250788: LatinIME slows down as amount of Text increases" 2011-10-10 10:54:51 -07:00
Eric Fischer
70fa87b54f Merge "Import revised translations." 2011-10-10 10:29:17 -07:00
Justin Ho
832c548575 Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom 2011-10-10 10:08:55 -07:00
Ben Murdoch
041ed0485a Merge "Size Autocomplete drop down items correctly." 2011-10-10 09:51:31 -07:00
Ben Murdoch
d17423739f Size Autocomplete drop down items correctly.
Fit the list item size to the content, and add a small amount of
padding.

Bug: 5420125
Change-Id: I50d6085654be77d1d314efad40df496e9c639c69
2011-10-10 17:19:55 +01: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
Justin Ho
17249d6472 Adding Pollux notification tone
Bug: 5416299

Change-Id: I471977f1119c1afe314fa7539d8452fab5a4961e
2011-10-10 07:55:30 -07:00
Justin Ho
3c902ecdae Update screen lock/unlock sound
Bug: 5416299

Change-Id: Icdb1d45ce2afd742cc89cfb8e53245a158d4c241
2011-10-10 07:50:07 -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
af8139ee9b Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME" 2011-10-10 00:59:41 -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
satok
dc9ddaee9a Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME
Bug: 5420127

Change-Id: I3649de36806fc24e1c85c2b15db5e37acad1f120
2011-10-10 15:49:22 +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
James Dong
f58ba65069 Support AMR as a file type so that it can be imported into movie studio
Change-Id: I3fc4f49ae0a210f53b1bab68716f4e558b3d91c5
related-to-bug: 5419452
2011-10-09 21:14:58 -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
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
1d8e7d640a Fix Cursor leak in SettingsBackupAgent.
Bug: 5434060

Change-Id: I805695a30d6778d0c7302e63bcfe3dc1a38488f4
2011-10-09 15:25:23 -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
fbb602fe1f Merge "Save the click position and restore it on orientation change." 2011-10-09 14:24:49 -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