Irfan Sheriff
0748907d6a
Merge "Ping through default dns & ping settings changes"
2011-06-28 21:44:45 -07:00
Scott Main
d3579e2930
am 846764e5: am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
...
* commit '846764e5aafc21d2bed9c7fde0b43e9548f96617':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
2011-06-28 21:02:05 -07:00
Scott Main
ae9124dc54
am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
...
* commit 'd3cc051dcb05a32eba1c208792e1bde4654a6db3':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
2011-06-28 20:57:40 -07:00
Scott Main
b79ff7a6a9
am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
...
* commit 'a687045045157eab2dbf657bb085cb0af68d72f2':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
2011-06-28 20:50:12 -07:00
Jeff Brown
b4324610d9
Merge "Add some logging code to track down touch issues."
2011-06-28 20:38:32 -07:00
Jeff Brown
771e5828e8
Merge "Improve input event consistency invariants."
2011-06-28 20:17:59 -07:00
Jeff Brown
7832080b5a
Improve input event consistency invariants.
...
Fixed some issues where inconsistent streams of events could
be generated by the dispatcher, particularly when switching from
hovering with one device to hovering with another.
Fixed a bug where the touch pad would fail to generate a new
HOVER_MOVE following a tap event. As a result, the hover event
stream would not resume until the user touched the touch pad
again.
Change-Id: I444dce84641fb12e56a0af84c931520771d6c493
2011-06-28 20:10:40 -07:00
Xavier Ducrohet
30f659aae9
am e1918353: am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
...
* commit 'e1918353e795d4f4fb67760ad593458517976072':
Bring in more layout lib changes from hc-mr1.
2011-06-28 19:15:32 -07:00
Xavier Ducrohet
0889d3a651
am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
...
* commit '842725fc642b7ba2c087cc81796973b838c23c76':
Bring in more layout lib changes from hc-mr1.
2011-06-28 19:14:05 -07:00
Hung-ying Tyan
a571674a93
Merge "Record external IP and port from SIP responses"
2011-06-28 19:04:30 -07:00
Xavier Ducrohet
34d6c0b7bb
am 66044737: (-s ours) am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
...
* commit '660447379d07f2e7480a30784f04cdd476877d73':
CherryPick 06942bc4 from hc-mr1. do not merge.
2011-06-28 19:00:25 -07:00
Xavier Ducrohet
1498c97163
am d7542263: (-s ours) am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
...
* commit 'd7542263c6dfa2522e8844c7c714fbf2ad112385':
CherryPick 988eeeb5 from hc-mr1. do not merge.
2011-06-28 18:58:23 -07:00
Xavier Ducrohet
a0e0b568cb
am adf5914b: (-s ours) am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
...
* commit 'adf5914b390061e48a86c9f55e68899cfa526841':
DO NOT MERGE. may fix build on some version of gcc
2011-06-28 18:58:20 -07:00
Xavier Ducrohet
b05d71e51c
am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
...
* commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
CherryPick 06942bc4 from hc-mr1. do not merge.
2011-06-28 18:58:09 -07:00
Xavier Ducrohet
81877d0fda
am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
...
* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
CherryPick 988eeeb5 from hc-mr1. do not merge.
2011-06-28 18:56:17 -07:00
Xavier Ducrohet
80543fa0e9
am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
...
* commit 'e0947693c9984727dfa775a747dd32aaaeb90284':
DO NOT MERGE. may fix build on some version of gcc
2011-06-28 18:56:14 -07:00
Xavier Ducrohet
bbfaea55ec
am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
...
* commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89':
Bring in more layout lib changes from hc-mr1.
2011-06-28 18:55:46 -07:00
Xavier Ducrohet
8d5e867299
am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
...
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
CherryPick 06942bc4 from hc-mr1. do not merge.
2011-06-28 18:55:42 -07:00
Xavier Ducrohet
691580c6bf
am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
...
* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
CherryPick 988eeeb5 from hc-mr1. do not merge.
2011-06-28 18:53:54 -07:00
Xavier Ducrohet
73b607f9ce
am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
...
* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a':
DO NOT MERGE. may fix build on some version of gcc
2011-06-28 18:53:51 -07:00
Xavier Ducrohet
340f5a765b
Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
2011-06-28 18:53:15 -07:00
Xavier Ducrohet
a77c3393d3
Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
2011-06-28 18:53:06 -07:00
Xavier Ducrohet
75d0ba1869
Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
2011-06-28 18:52:59 -07:00
Xavier Ducrohet
10779f5a6c
Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
2011-06-28 18:52:43 -07:00
Jeff Sharkey
73a64f6817
Merge "Better network stats parsing, integer tags, async."
2011-06-28 18:02:12 -07:00
mike wakerly
0603f314a4
am 430cee09: am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events.
...
* commit '430cee0961936746c272aaf5c5f52b1240f6a9b4':
Add intent actions for new firmware events.
2011-06-28 17:57:50 -07:00
Justin Ho
1d038e20b1
Merge "Removing unused drawables"
2011-06-28 17:32:52 -07:00
Christopher Tate
80092d07a4
Merge "Fix settings restore even harder"
2011-06-28 17:23:44 -07:00
mike wakerly
d2c8b65dac
am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events.
...
* commit 'af08ddbc42fb51de76958d859cf0e87d0b9e475e':
Add intent actions for new firmware events.
2011-06-28 17:22:53 -07:00
mike wakerly
9e95be6c9d
am 2f9ad8b4: Add intent actions for new firmware events.
...
* commit '2f9ad8b499cb150d5cdfe84a9795992c5dd42cff':
Add intent actions for new firmware events.
2011-06-28 17:19:05 -07:00
Huahui Wu
75d798691a
Merge "2nd try: Gets the URL that has a cert error and carrys it in SslError."
2011-06-28 16:26:32 -07:00
Andreas Huber
299b157e10
Merge "Support for writing output data to a provided callback function instead of a file"
2011-06-28 14:49:35 -07:00
Dianne Hackborn
f482924f98
Merge "Fix battery history management."
2011-06-28 14:34:51 -07:00
Jamie Gennis
81493339be
Merge "SurfaceTexture: add a CPU -> GL sync test."
2011-06-28 14:27:17 -07:00
Romain Guy
56805fce86
Merge "Fix parameter order evaluation issue."
2011-06-28 14:03:20 -07:00
Daisuke Miyakawa
06c3b3a1ae
Merge "Use new usage feedback API in phone app / strequent"
2011-06-28 14:02:01 -07:00
Jeff Brown
19e2448332
Merge "Hover and stylus API cleanup."
2011-06-28 13:58:44 -07:00
Jamie Gennis
dfcff4b4ef
SurfaceTexture: add a CPU -> GL sync test.
...
This change adds a test to verify that proper synchronization is done
when using SurfaceTexture to use CPU generated images as OpenGL ES
textures in 'synchronous mode'. Synchronous mode is particularly tricky
because SurfaceTexture will allow the buffer that's currently bound to
the GL texture to be dequeued. We rely on Gralloc's lock function to
block until this buffer is no longer being used by the OpenGL ES.
Change-Id: I1c4e37f3e9d60ab9a0905a90a1f5060fda8e485c
2011-06-28 13:18:07 -07:00
Jim Miller
4ae5d80952
Merge "Fix 4691563: Fix memory leak caused by Tweeners hanging onto references."
2011-06-28 13:17:04 -07:00
Jim Miller
78853b5904
Merge "Fix 4691563: Don't show lock before unlock screen"
2011-06-28 12:57:25 -07:00
Jamie Gennis
67b4cff399
Merge changes I9fb59763,I8b2c6e00
...
* changes:
SurfaceTexture: consume buffers after err checks
SurfaceTexture: change onFrameAvailable behavior
2011-06-28 12:55:03 -07:00
Andreas Huber
124d37617b
Merge "Multiple changes to ACodec/codec tools:"
2011-06-28 12:48:01 -07:00
Daniel Sandler
aba44a6309
Merge "Now showing: Navigation Bar, The Final Layout"
2011-06-28 10:37:17 -07:00
Andreas Huber
5113eaf2cd
Merge "New option in the stagefright commandline tool."
2011-06-28 10:16:51 -07:00
Huahui Wu
6845576da3
Merge "Revert "Gets the URL that has a cert error and carrys it in SslError.""
2011-06-28 10:12:56 -07:00
Jeff Tinker
2904fb55d8
Merge "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video."
2011-06-28 10:12:08 -07:00
Huahui Wu
2a5be6620b
Merge "Gets the URL that has a cert error and carrys it in SslError."
2011-06-28 09:38:47 -07:00
Debashish Chatterjee
a3a36dbec0
Merge "Got rid of deprecated EXTRA_CHANGED_BY from VoicemailContract."
2011-06-28 09:31:27 -07:00
Narayan Kamath
77b26d9b9c
Merge "Make the system global search provider a user setting."
2011-06-28 09:12:53 -07:00
Andy McFadden
bae6579eb2
Remove native EventRecurrence parser
...
Switch over to the new parser.
Bug 4575374
Change-Id: If78d8042fb266182900398f7fc464a048c779966
2011-06-28 07:43:27 -07:00