Commit Graph

36209 Commits

Author SHA1 Message Date
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
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
Dianne Hackborn
0af34b495d am 351ddeb2: am 5db9ff97: Update final 13 API def.
* commit '351ddeb2da65fc020e80d77d80f08aa1dfd820d7':
  Update final 13 API def.
2011-06-27 17:11:15 -07:00
Dianne Hackborn
b542ca9d6f am 5db9ff97: Update final 13 API def.
* commit '5db9ff97aa8f36f330f41f5ae42467795ef075b8':
  Update final 13 API def.
2011-06-27 17:07:29 -07:00
Jake Hamby
562e6f8255 Merge "Don't enable Bluetooth when booting into airplane mode." 2011-06-27 16:45:50 -07:00
Jamie Gennis
50c4efc2a4 SurfaceTexture: consume buffers after err checks
This change moves the point at which queued buffers get consumed to
after any error checks that could cause updateTexImage to fail.  This
way, if updateTexImage returns an error the buffer remains queued.
2011-06-27 15:45:40 -07:00
Jamie Gennis
3d8063b02e SurfaceTexture: change onFrameAvailable behavior
This change alters the conditions under which the onFrameAvailable
callback gets called by the C++ SurfaceTexture class.  The new behavior
is to call the callback whenever a frame gets queued that will be
visible to the buffer consumer.  This means that buffers queued in
synchronous mode always trigger the callback, as those buffers will
remain pending until they are consumed.  Buffers queued in asynchronous
mode will only trigger the callback if there was not previously an
unconsumed buffer pending.

The new behavior means that a consumer should perform a draw operation
exactly once for every onFrameAvailable call that it recieves.  This
change also modifies SurfaceFlinger and the SurfaceTexture JNI to
support of the new behavior.

Change-Id: I8b2c6e00961d3d58b11c6af50b555b6e4c5f5b40
2011-06-27 15:45:39 -07:00
Brian Carlstrom
aa444e3bfc Merge "Moving ssl_certificate layout, resources, and helper code to SslCertificate Add IKeyChainService.deleteCaCertificate" 2011-06-27 15:15:29 -07:00
Jake Hamby
1f95efb97f Merge "Fix race condition in WakeLocks." 2011-06-27 14:54:24 -07:00
Iliyan Malchev
c31eb73a15 Merge "MemoryHeapBase: Save and binderize the offset" 2011-06-27 14:20:01 -07:00
Iliyan Malchev
f87e822167 Merge "CameraService: Decouple dequeue and lock" 2011-06-27 14:19:53 -07:00
Robert Ly
371758c9d9 am d1e78095: am 0711c86c: am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
* commit 'd1e78095452379e39a354c651d6c6cab351c52d5':
  docs: fixing new superscript for rs
2011-06-27 14:15:46 -07:00
Anirudh Dewani
5c44514864 am cf33a02b: am 3ba39ef2: am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
* commit 'cf33a02bef19e1d0f11d119194c4f8439a06f1e2':
  Typo in spinner tutorial.
2011-06-27 14:15:37 -07:00
Dianne Hackborn
00018a07e3 am 06ca9b90: (-s ours) am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
* commit '06ca9b90e664235d79304a4611529c09256d060e':
  DO NOT MERGE.  Fix density compat mode.
2011-06-27 14:15:13 -07:00
Jean-Baptiste Queru
1238bd48ac am ec5039b3: am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
* commit 'ec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172':
  Add WEBP to the list of Image formats that support Compression.
2011-06-27 14:15:01 -07:00
Jean-Baptiste Queru
61b6b99f00 am 9f1ef6d5: am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility"
* commit '9f1ef6d57bbf1ac524eff849c8976acb012b5687':
  Tweak for forward-compatibility
2011-06-27 14:14:57 -07:00
Wink Saville
de81a86d78 am 7eff4bb3: am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
* commit '7eff4bb3f9c0cf0335dd1b2769bcb352b137dbaa':
  Temporary re-enabling iface name change handling on HO
2011-06-27 14:14:45 -07:00
Scott Main
fced2f899c am 7c58d671: am f169bae8: am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
* commit '7c58d671d542f3a9923a9ea2e63b46005d81a445':
  docs: add emphasis to adding a search button in activity UI
2011-06-27 14:14:37 -07:00
Scott Main
a6824afeab am 44b48a37: am db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers
* commit '44b48a377d47bb27b667ab87347f0a88ba3fba0b':
  docs: update docs for new screen support attributes and qualifiers
2011-06-27 14:14:26 -07:00
Bart Sears
fcb5222ed2 Merge "Update DroidSansEthiopic to ver 1.03" 2011-06-27 14:10:12 -07:00
Dave Santoro
29abacd2c4 Merge "Renamed INCLUDE_PROFILE param to ALLOW_PROFILE." 2011-06-27 13:52:00 -07:00
Anu Sundararajan
5728a92e29 MemoryHeapBase: Save and binderize the offset
The offset that is used in the creation of the MemoryHeapBase must be saved, so
that it can be used to recreate the Heap when an IMemory object is passed
across process boundary through the binder.

Change-Id: Ie618fb5c0718e6711f55ed9235616fd801e648dc
Signed-off-by: Anu Sundararajan <sanuradha@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-06-27 13:48:51 -07:00