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
Jason Simmons
c18d4da5e4
Add a linear transform library to libutils
...
Change-Id: Icdec5a6bebd9d8f24b3f335f8ec8b09a5810a774
2011-06-28 17:43:30 -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
satok
2b4b4f44e5
Merge "Fix the visibility of ongoing IME switcher"
2011-06-28 06:38:13 -07:00
repo sync
433f8930e7
Merge "Support INVITE w/o SDP."
2011-06-28 04:50:33 -07:00
Narayan Kamath
c477833f82
Merge "Expose the currently used engine to bundled apps."
2011-06-28 01:23:41 -07:00
JP Abgrall
b253a012b3
Merge "NetworkStatsService: disabled by default"
2011-06-27 23:45:58 -07:00
Hung-ying Tyan
f2fb35b7a3
Merge "Start keepalive process for the caller of a SIP call"
2011-06-27 22:38:22 -07:00
Irfan Sheriff
d1ba804163
Merge "Fixing null pointer b/4962091"
2011-06-27 20:13:09 -07:00
Wink Saville
41adf8eb4b
am cf2980ff: am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
...
* commit 'cf2980ffef2780ab41eb196f398df482b105312e':
Data connection retry pattern could be broken by PDP sharing
2011-06-27 19:59:40 -07:00
Wink Saville
9f843bbee5
am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
...
* commit '29d1dde972acaaf3685b60de3da00c1809c510f9':
Data connection retry pattern could be broken by PDP sharing
2011-06-27 19:57:20 -07:00
Wink Saville
6fa3003e46
Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
2011-06-27 19:54:27 -07:00
Mathias Agopian
4bf81b14ec
Merge "PermissionCache caches permission checks"
2011-06-27 18:44:02 -07:00
Jake Hamby
88643bce27
Merge "Fix crash while device is pairing / unpairing."
2011-06-27 18:38:27 -07:00
Brian Carlstrom
f0ab5592e5
Merge "Add KeyStoreTest.testGet"
2011-06-27 18:21:39 -07:00
Mathias Agopian
99b49840d3
PermissionCache caches permission checks
...
This is intended to absorb the cost of the IPC
to the permission controller.
Cached permission checks cost about 3us, while
full blown ones are two orders of magnitude slower.
CAVEAT: PermissionCache can only handle system
permissions safely for now, because the cache is
not purged upon global permission changes.
Change-Id: I8b8a5e71e191e3c01e8f792f253c379190eee62e
2011-06-27 17:42:15 -07:00
James Dong
df63ad85de
Merge "Add a testcase to test PNG files support for KenBurn effect."
2011-06-27 17:15:43 -07:00
Dianne Hackborn
0a6dfdec26
am 229ff64b: am 351ddeb2: am 5db9ff97: Update final 13 API def.
...
* commit '229ff64bde1f8ffeb23a305178a7f6a57bffe1e5':
Update final 13 API def.
2011-06-27 17:13:16 -07:00