65323 Commits

Author SHA1 Message Date
James Dong
4651c0ea80 Merge "Don't call virtual functions in destructors for the writer classes" 2012-02-03 15:37:40 -08:00
Mathias Agopian
4d10ed3210 Merge "fix a dead-lock in eglMakeCurrent" 2012-02-03 15:35:45 -08:00
Stephen Hines
e05bc81c19 Merge "We should not throw for non-fatal errors." 2012-02-03 15:34:38 -08:00
Stephen Hines
be74bdd234 We should not throw for non-fatal errors.
BUG=5955072

Change-Id: I731242805957a057aaff1ba96a58c69d6e474a59
2012-02-03 15:29:36 -08:00
Mathias Agopian
7b864906e5 fix a dead-lock in eglMakeCurrent
this was introduced in a recent change. eglMakeCurrent can
end up calling eglDestroyImageKHR via ANativewWindow::disconnect
when the consumer is in the same process.

we make sure we don't hold the lock while this is happening.

Change-Id: Id17fe4fd76eecf5f962cefb9aa32be41fc1b042d
2012-02-03 15:24:51 -08:00
Jeff Sharkey
241dde2306 Unify shorthand for byte-based units.
Change-Id: If990859dee3f0973e1d4c48f05312c84071b3328
2012-02-03 14:50:13 -08:00
Eric Fischer
1c9fcd9086 Merge "Import translations. DO NOT MERGE" 2012-02-03 13:48:14 -08:00
Eric Fischer
8d3d580c51 Import translations. DO NOT MERGE
Change-Id: I50c6c58c7b20c3e8ce02adeac7e05f23d0a3fe44
2012-02-03 12:24:15 -08:00
Adam Cohen
041a434d38 Merge "Handle null PendingIntents, Bitmaps, Uris and Intents in RemoteViews (issue 5223291)" 2012-02-03 12:06:20 -08:00
Amith Yamasani
1ef7d13172 Merge "Multi-user - 1st major checkin" 2012-02-03 12:04:40 -08:00
Amith Yamasani
742a671273 Multi-user - 1st major checkin
Switching activity stacks
Cache ContentProvider per user
Long-press power to switch users (on phone)

Added ServiceMap for separating services by user
Launch PendingIntents on the correct user's uid
Fix task switching from Recents list
AppWidgetService is mostly working.

Commands added to pm and am to allow creating and switching profiles.

Change-Id: I15810e8cfbe50a04bd3323a7ef5a8ff4230870ed
2012-02-03 12:01:47 -08:00
Fabrice Di Meglio
2d315df641 Merge "Fix bug #5929529 Parentheses aren't correctly rendered in RTL context" 2012-02-03 11:57:54 -08:00
James Dong
6004df9408 Merge "Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine" 2012-02-03 11:29:59 -08:00
James Dong
9989f3cfbb Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine
o this should be reverted after the problem is fixed.
o related-to-bug: 5947347

Change-Id: Iaec4b59d2c99c975e83f0588a813e9a4bfcb7ee2
2012-02-03 11:20:03 -08:00
Robert Greenwalt
06e601f91b Merge "Add some logging to NDC." 2012-02-03 08:54:02 -08:00
Glenn Kasten
f55bc56490 Merge "Use audio_in_acoustics_t consistently" 2012-02-03 08:31:01 -08:00
Glenn Kasten
191c849283 Merge "Use ToneGenerator::tone_type consistently" 2012-02-03 08:00:52 -08:00
Glenn Kasten
ed4dc900f7 Merge "Use NULL not 0 for raw pointers" 2012-02-03 07:59:42 -08:00
George Mount
3debfa68c4 Merge "Enable webkit text entry for all fields" 2012-02-03 07:58:14 -08:00
George Mount
60da2fc8c0 Merge "Use a node pointer to identify content-editable fields." 2012-02-03 07:58:07 -08:00
Glenn Kasten
3694ec1f19 Use NULL not 0 for raw pointers
Use if (p != NULL) instead of if (ptr)

Change-Id: Iaec3413a59ccbf233c98fcd918cc7d70ac5da9fa
2012-02-03 07:57:01 -08:00
Glenn Kasten
7bd4f6f4d0 Merge "For performance, return large objects by reference" 2012-02-03 07:46:42 -08:00
Glenn Kasten
22152a6807 Merge "No need to check a wp<> for 0 before promote()" 2012-02-03 07:45:13 -08:00
Glenn Kasten
dc3ac85009 Constructor initialization and const fields
In constructors, initialize member fields in the initialization list
rather than constructor body where possible.  This allows more fields
to be const, provided they are never modified.

Also initialize POD fields in constructor, unless it's obvious they
don't need to be initialized.  In that case, put a comment instead.

Remove explicit clear() in destructors on fields that are now const.

Give AudioSessionRef a default constructor, so it's immutable fields can
be marked const.

Add comment about ~TrackBase() trick.

Initialize fields in declaration order to make it easier to confirm that
all fields are set.

Move initialization of mHardwareStatus from onFirstRef() to constructor.

Use NULL not 0 to initialize raw pointers in initialization list.

Rename field mClient to mAudioFlingerClient, and getter from client()
to audioFlingerClient().

Change-Id: Ib36cf6ed32f3cd19003f40a5d84046eb4c122052
2012-02-03 07:37:14 -08:00
Glenn Kasten
a12b6d1d44 Merge "Cleanup thread types" 2012-02-03 07:26:28 -08:00
Glenn Kasten
08d5eb9885 Merge "Make AudioTrack control block volume field private" 2012-02-03 07:18:06 -08:00
Adam Cohen
c6151f2369 Handle null PendingIntents, Bitmaps, Uris and Intents in RemoteViews (issue 5223291)
Change-Id: If8895b774dee6ba4138751a0c2f68c70402b3fa5
2012-02-02 22:12:58 -08:00
Stephen Hines
cc2daede56 Merge "Properly recover from failed compilation." 2012-02-02 21:25:19 -08:00
Jim Miller
c7aab1a9f1 Merge "Fix 5907223: Fix lock screen glitch caused on devices with a system bar" 2012-02-02 19:25:06 -08:00
Fabrice Di Meglio
ab8c73882e Fix bug #5929529 Parentheses aren't correctly rendered in RTL context
- do BiDi mirrored char mirroring in TextLayoutCache
- see BiDi mirrored chars list at:

 http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedBinaryProperties.txt

Change-Id: Ia0af0e252dbb0c55cc689bc9db34e05591bb6ee8
2012-02-02 19:07:02 -08:00
Jeff Brown
ec99f609cc Merge "Rename CancellationSignal using preferred spelling." 2012-02-02 18:50:55 -08:00
Jeff Brown
4c1241df8f Rename CancellationSignal using preferred spelling.
Bug: 5943637
Change-Id: I12a339f285f4db58e79acb5fd8ec2fc1acda5265
2012-02-02 18:02:16 -08:00
Xavier Ducrohet
c445ed701a Merge "Make Layoutlib compile on Java 6." 2012-02-02 17:47:08 -08:00
Xavier Ducrohet
46d43ccfd8 Make Layoutlib compile on Java 6.
Change-Id: Ic8f0e321c6c218de83664fc01f253a07fa80852c
2012-02-02 17:45:45 -08:00
Romain Guy
8d13ef3c59 Merge "Separate interface definition and implementation of Snapshot" 2012-02-02 17:33:47 -08:00
Romain Guy
ada4d53d50 Separate interface definition and implementation of Snapshot
The Snapshot class is getting complicated enough that its implementation
should now live in a separate .cpp file. This will become particularly
useful when support for clip regions and paths will be added later on.

Change-Id: I050fac5683a9f7a0ff2f7a6beec3dd28aa5eb0d8
2012-02-02 17:31:16 -08:00
Robert Greenwalt
f0be1d89bf Add some logging to NDC.
We're getting some lockups of netd and this can help point us
in the right direction.

bug:5864209
Change-Id: Id8bdb0a758c5b161e0143de61b5f39c3a982e329
2012-02-02 16:38:38 -08:00
Mathias Agopian
b545eaa9cb Merge "separate transactions from updates" 2012-02-02 16:28:05 -08:00
Mathias Agopian
5122453f9c Merge "fix an issue where SF would spin if /sys/power/wait_for_fb_xxx don't exist" 2012-02-02 16:27:37 -08:00
Jeff Sharkey
34c4d2e249 Merge "Support snoozing of data warning notification." 2012-02-02 16:26:41 -08:00
Jeff Sharkey
0e2e5f8b56 Support snoozing of data warning notification.
Introduce second snooze timestamp to support dismissal of data usage
warning notification.  Also explicitly set notification "when" to
avoid fighting with other notifications, such as ongoing downloads.

Bug: 5443756, 5262414
Change-Id: I03342c25b0410b1b2db84de9a40884f04cb1d8ae
2012-02-02 16:22:33 -08:00
Jim Miller
bf032650e3 Fix 5907223: Fix lock screen glitch caused on devices with a system bar
This fixes a regression caused by making the lock screen window slippery where
dragging the target over the system bar would incorrectly cause it to
snap to an invisible target.  It now interprets MotionEvent.ACTION_CANCEL
the same as an "up" event and resets to the initial state.

Change-Id: I9a3c195371d64e1a4613f6f1fb0a043e9a47a601
2012-02-02 16:22:29 -08:00
Mathias Agopian
deb1e6c6e5 fix an issue where SF would spin if /sys/power/wait_for_fb_xxx don't exist
we now exit the Display thread on any error happening on these files.
also refactor the code and remove a lot of unused stuff.

Change-Id: I8d080c35b211890ca20ae09fa36fbdccdf5669a8
2012-02-02 16:20:27 -08:00
James Dong
96d4f4d8d8 Merge "Unhide AAC_ADTS file format" 2012-02-02 16:15:16 -08:00
Wink Saville
8e195a20d8 Merge "Telephony: Fix get_imsi and icc_io" 2012-02-02 16:04:17 -08:00
James Dong
874d1f1f65 Unhide AAC_ADTS file format
o also actually decprecated RAW_AMR file format

Change-Id: Ic8ef5b0dca6f793fddf9e79d431e79f5083f7bff
2012-02-02 15:50:24 -08:00
Dianne Hackborn
c69acaef0b Merge "New global setting for developer options." 2012-02-02 15:17:16 -08:00
Romain Guy
bc18f28907 Merge "Disable debugging code in the font renderer" 2012-02-02 15:16:30 -08:00
James Dong
c2240b127b Don't call virtual functions in destructors for the writer classes
Have not found any concrete bugs related to these calls yet, but we should avoid
calling virtual functions in destructors, regardless.

Change-Id: I2d47b79d3fb2d29f418619bee83aa147d232a5d4
2012-02-02 15:13:56 -08:00
Romain Guy
b629490ffb Disable debugging code in the font renderer
Change-Id: I92463057ff4ae712bb25789db1667ff1ecfd389f
2012-02-02 15:13:18 -08:00