Joe Onorato
09ed308945
Merge "Don't throw when userActivity fails because of the permission check." into gingerbread
2010-10-11 13:52:34 -07:00
Brad Fitzpatrick
aefa57869c
Merge "On boot, advance time to at least 1970." into gingerbread
2010-10-11 13:00:51 -07:00
Mathias Agopian
7f5b5a8ebf
Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
2010-10-11 12:41:33 -07:00
Mathias Agopian
23a0920339
fix a bug where timeouts would only be handled when a message was delivered
...
Change-Id: I98c69b129e75e065e61f47e54f0f855d9401b0dc
2010-10-11 12:40:09 -07:00
Andreas Huber
5b25eff784
Merge "Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
2010-10-11 12:36:03 -07:00
Mike Lockwood
c9df3e82d1
Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
2010-10-11 11:56:47 -07:00
Brad Fitzpatrick
7669f03f89
Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
2010-10-11 11:56:40 -07:00
Xia Wang
e3e077d738
Merge "Add mock ril control commands and tests" into gingerbread
2010-10-11 10:28:20 -07:00
Mike Lockwood
29a4f07b7e
Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
2010-10-10 16:32:49 -07:00
Justin Ho
9cfdf64d46
Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
2010-10-10 16:30:01 -07:00
Vasu Nori
ad96c8bba6
Merge "bug:3082865 don't use IN to construct sql to delete downloads" into gingerbread
2010-10-10 15:51:42 -07:00
Xavier Ducrohet
511f223765
Merge "Avoid pre-processing images when they won't be used" into gingerbread
2010-10-10 15:14:34 -07:00
Jeff Brown
f817a6e0fd
Merge "Added more robust tracking and cancelation of events." into gingerbread
2010-10-10 14:47:57 -07:00
Jeff Brown
90f0cee685
Added more robust tracking and cancelation of events.
...
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.
Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.
Pruned some of the input dispatcher log output.
Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources. This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.
Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
2010-10-10 14:45:51 -07:00
Gilles Debunne
c754c60a88
Merge "Voice input replaces selected text." into gingerbread
2010-10-10 14:01:10 -07:00
Mike Lockwood
dc798229c6
Merge "GPS: More HAL initialization cleanup" into gingerbread
2010-10-10 13:13:16 -07:00
Wink Saville
5f8993277a
Merge "Add some error-case logging." into gingerbread
2010-10-10 12:27:34 -07:00
Irfan Sheriff
ba18dd9fa9
Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread
2010-10-10 12:21:51 -07:00
John Wang
46e92cb3d3
Merge "Fix startDtmf." into gingerbread
2010-10-10 11:38:39 -07:00
Gilles Debunne
c486fcc633
Merge "Made paste work in ExtractEditText" into gingerbread
2010-10-10 10:51:52 -07:00
Mike Lockwood
04d921fa29
Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread
2010-10-09 17:15:54 -07:00
Chung-yih Wang
ea01cfbb53
Merge "Do not release the wifi lock if the screen is off." into gingerbread
2010-10-08 23:25:11 -07:00
Scott Main
e60bb383aa
am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
...
Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread
* commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-08 17:27:28 -07:00
Gilles Debunne
c91355b2b7
Merge "Other improvements to text cursor movement." into gingerbread
2010-10-08 17:14:45 -07:00
Mindy Pereira
e0af18ecb6
Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
2010-10-08 17:10:21 -07:00
Scott Main
1965b2da51
am 50f86c65: docs: a few style adjustments to admin doc
...
Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread
* commit '50f86c65206072be0ca924f03b8d460365199bcd':
docs: a few style adjustments to admin doc
2010-10-08 16:39:08 -07:00
Scott Main
a0f02af69d
am 2e5a22aa: docs: remove old "new" tags from side nav
...
Merge commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d' into gingerbread
* commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d':
docs: remove old "new" tags from side nav
2010-10-08 16:30:47 -07:00
Andreas Huber
313ecd5352
Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread
2010-10-08 15:49:48 -07:00
Scott Main
08302f0a0f
am 65e62f4f: docs: new web apps dev guides
...
Merge commit '65e62f4f908394fc469cf535fef7c16035a428a2' into gingerbread
* commit '65e62f4f908394fc469cf535fef7c16035a428a2':
docs: new web apps dev guides
2010-10-08 15:43:44 -07:00
Brad Fitzpatrick
8623f94279
Merge "Minor SharedPreference clean-up." into gingerbread
2010-10-08 15:35:45 -07:00
Dianne Hackborn
9c331df44c
Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
2010-10-08 15:21:49 -07:00
Dianne Hackborn
292ec505a3
Merge "Maybe fix #3076572 : phone process crashes in SipService, trying to get wifi lock" into gingerbread
2010-10-08 15:09:23 -07:00
Steve Howard
ef74539961
Merge "Update DownloadManager API to support bulk actions." into gingerbread
2010-10-08 14:42:43 -07:00
Gilles Debunne
31a7f2409b
Merge "TextView cursor and selection improvements." into gingerbread
2010-10-08 14:42:42 -07:00
Dianne Hackborn
51861cda0e
Merge "Fix issue #3074745 : Crash in system process" into gingerbread
2010-10-08 14:05:01 -07:00
Brad Fitzpatrick
6dd8eec818
Merge "DropBoxManager.Entry implements Closeable" into gingerbread
2010-10-08 12:59:30 -07:00
Andreas Huber
1b66c4aca7
Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread
2010-10-08 12:51:31 -07:00
Jeff Brown
6ce23c4c8e
Merge "Clarify some comments on individual key codes." into gingerbread
2010-10-08 12:44:43 -07:00
Mike Lockwood
7bfdae64bd
Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
2010-10-08 11:17:17 -07:00
Andreas Huber
5d372aabe4
Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
2010-10-08 11:16:07 -07:00
Andreas Huber
ef072a1f4b
Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
2010-10-08 10:59:52 -07:00
James Dong
b2df56fcf6
Merge "Name the writer threads" into gingerbread
2010-10-08 10:06:22 -07:00
Andreas Huber
3389b28cd0
Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
2010-10-08 10:01:37 -07:00
Gilles Debunne
285bb1b8ab
Merge "Long press with trackball selects word under cursor." into gingerbread
2010-10-08 09:22:29 -07:00
Eric Laurent
740f0561f2
Merge "Added getter for session Id to AudioSink" into gingerbread
2010-10-08 08:28:08 -07:00
Andreas Huber
fc85f3a7f4
Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
2010-10-08 08:02:42 -07:00
Chung-yih Wang
7d7daee5fa
Merge "SipService: add permission check for using API" into gingerbread
2010-10-07 21:28:23 -07:00
Marco Nelissen
8950fabfbc
am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
...
Merge commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f' into gingerbread
* commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f':
Do not merge.
2010-10-07 17:48:46 -07:00
Kenny Root
ddfbafa786
Merge "Symlink application lib directory when on SD card" into gingerbread
2010-10-07 17:38:44 -07:00
Hung-ying Tyan
ed1076e47e
Merge "Use explicit intent for installing credentials." into gingerbread
2010-10-07 17:27:28 -07:00