Mathias Agopian
2e6ae0138b
Merge "fix a dead-lock in eglMakeCurrent"
2012-02-03 15:35:45 -08:00
Stephen Hines
cdaa8e83c4
Merge "We should not throw for non-fatal errors."
2012-02-03 15:34:38 -08:00
Mathias Agopian
a4b2c04182
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
Eric Fischer
b7a38f0f08
Merge "Import translations. DO NOT MERGE"
2012-02-03 13:48:14 -08:00
Adam Cohen
e96a27b1a1
Merge "Handle null PendingIntents, Bitmaps, Uris and Intents in RemoteViews (issue 5223291)"
2012-02-03 12:06:20 -08:00
Amith Yamasani
a11edd8dc1
Merge "Multi-user - 1st major checkin"
2012-02-03 12:04:40 -08:00
Amith Yamasani
4e975bb488
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
abe39f190f
Merge "Fix bug #5929529 Parentheses aren't correctly rendered in RTL context"
2012-02-03 11:57:54 -08:00
James Dong
4da4454266
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
Robert Greenwalt
02861a5a78
Merge "Add some logging to NDC."
2012-02-03 08:54:02 -08:00
Glenn Kasten
fb3f824f27
Merge "Use audio_in_acoustics_t consistently"
2012-02-03 08:31:01 -08:00
Glenn Kasten
8d74e90460
Merge "Use ToneGenerator::tone_type consistently"
2012-02-03 08:00:52 -08:00
Glenn Kasten
b9b32cb622
Merge "Use NULL not 0 for raw pointers"
2012-02-03 07:59:42 -08:00
George Mount
3676d6ed07
Merge "Enable webkit text entry for all fields"
2012-02-03 07:58:14 -08:00
George Mount
d5305c8c14
Merge "Use a node pointer to identify content-editable fields."
2012-02-03 07:58:07 -08:00
Glenn Kasten
0139d045a4
Merge "For performance, return large objects by reference"
2012-02-03 07:46:42 -08:00
Glenn Kasten
0fb2c0a2d7
Merge "No need to check a wp<> for 0 before promote()"
2012-02-03 07:45:13 -08:00
Glenn Kasten
28f0de58fe
Merge "Cleanup thread types"
2012-02-03 07:26:28 -08:00
Glenn Kasten
e7bc3ae952
Merge "Make AudioTrack control block volume field private"
2012-02-03 07:18:06 -08:00
Stephen Hines
53610a363f
Merge "Properly recover from failed compilation."
2012-02-02 21:25:19 -08:00
Jim Miller
10951312df
Merge "Fix 5907223: Fix lock screen glitch caused on devices with a system bar"
2012-02-02 19:25:06 -08:00
Jeff Brown
7cd88ce966
Merge "Rename CancellationSignal using preferred spelling."
2012-02-02 18:50:55 -08:00
Xavier Ducrohet
6c44ea2d49
Merge "Make Layoutlib compile on Java 6."
2012-02-02 17:47:08 -08:00
Romain Guy
6f3114cafe
Merge "Separate interface definition and implementation of Snapshot"
2012-02-02 17:33:47 -08:00
Mathias Agopian
064b68d1bc
Merge "separate transactions from updates"
2012-02-02 16:28:05 -08:00
Mathias Agopian
cf0241bee2
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
86909fde16
Merge "Support snoozing of data warning notification."
2012-02-02 16:26:41 -08:00
Mathias Agopian
67016af1e4
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
8330cac51d
Merge "Unhide AAC_ADTS file format"
2012-02-02 16:15:16 -08:00
Wink Saville
9f164404d8
Merge "Telephony: Fix get_imsi and icc_io"
2012-02-02 16:04:17 -08:00
Dianne Hackborn
e25eb6dad6
Merge "New global setting for developer options."
2012-02-02 15:17:16 -08:00
Romain Guy
c22a0d8ffa
Merge "Disable debugging code in the font renderer"
2012-02-02 15:16:30 -08:00
Alex Sakhartchouk
2da61e9174
Merge "Fix an incorrect assert that doesn't account for element array size."
2012-02-02 14:54:32 -08:00
Chet Haase
c823242fe9
Merge "Fix bug in LayoutTransition that caused views to stay invisible"
2012-02-02 14:35:58 -08:00
Glenn Kasten
42f82b4da5
Merge "Fix const sp<>& in parameter list and return value"
2012-02-02 13:31:23 -08:00
James Dong
59eb033c84
Merge "Removed a loop for buffer lookup"
2012-02-02 13:30:51 -08:00
Glenn Kasten
518f4b8384
Merge "Unconditional delete"
2012-02-02 13:30:48 -08:00
Glenn Kasten
96fb5532f5
Merge "More audio_stream_type_t"
2012-02-02 13:26:12 -08:00
Fabrice Di Meglio
31326a522e
Merge "Update BiDiTest app"
2012-02-02 13:25:30 -08:00
Glenn Kasten
a1eee39f58
Merge "Thread::getTid returns pid_t gettid() after run"
2012-02-02 13:24:52 -08:00
Jeff Sharkey
6815727eb7
Merge "Avoid NDC deadlock when re-arming network alert."
2012-02-02 13:19:37 -08:00
Marco Nelissen
e08b48632b
Merge "Enable media scanner bulk inserts"
2012-02-02 10:48:01 -08:00
Chet Haase
c5d46bd3e6
Merge "Add Developer Option setting for Animator scaling."
2012-02-02 10:42:44 -08:00
Dianne Hackborn
2b42ecc4ca
Merge "Use Choreographer for window manager animation timing."
2012-02-02 10:41:50 -08:00
Scott Main
18419d50a0
am 1e148f50: am 2adfc9de: am 633de7ba: docs: fix meta description tag for homepage
...
* commit '1e148f509eda581b8ef7cf77acad7f9216034891':
2012-02-02 10:03:43 -08:00
Scott Main
8e1bd305cd
am c019983a: am c78a300c: am 6aaa27fb: docs: fix broken link
...
* commit 'c019983a21f3887945cceb2024f3b5002aea7185':
2012-02-02 10:03:42 -08:00
Scott Main
66af39ecdb
am 4e133702: am be09298e: am 633de7ba: docs: fix meta description tag for homepage
...
* commit '4e133702acc81ac72a23aa9784c05deec5be59b6':
docs: fix meta description tag for homepage
2012-02-02 10:03:25 -08:00
Eric Laurent
a99af6e381
Merge "modifications for new webrtc modules"
2012-02-02 09:39:28 -08:00
Mathias Agopian
99ce5cdeb3
separate transactions from updates
...
with this changes, SF transactions are handled as soon as possible
but do not trigger updates. the update is delayed until the next
vsync.
this allows us to work much better without requiring triple-buffering.
Change-Id: I1fa10794d0cf742129f0877698b7b1e1f2ec7401
2012-02-01 20:43:06 -08:00
James Dong
93bfeedd37
Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation"
2012-02-01 18:53:50 -08:00
