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
Chia-chi Yeh
35766cfcc4
Merge "KeyStore: fix test-keystore"
2011-06-27 13:14:13 -07:00
Mike J. Chen
f30745ef6c
Merge changes I0077e5e5,I42cbed69
...
* changes:
Hookup interface status to other clients
Revert "Revert "Propagate new link-status-change message to any NetworkManagementService""
2011-06-27 12:56:47 -07:00
Svetoslav Ganov
0c4b1e994c
Merge "AccessibilityInjectorTest did not restore the default key binsings."
2011-06-27 12:40:50 -07:00
Svetoslav Ganov
06ea9a8b62
Merge "ArrayIndexOutOfBounds exception in TouchExplorer."
2011-06-27 12:07:27 -07:00
Robert Ly
4743907b0e
am 0711c86c: am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
...
* commit '0711c86c3886fe869216965b868d30e9bb3abcea':
docs: fixing new superscript for rs
2011-06-27 11:58:26 -07:00
Robert Ly
2263f5a736
am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
...
* commit '81cbc294ddb08c2bc08be9b2abbbcc7c19ec88d9':
docs: fixing new superscript for rs
2011-06-27 11:49:30 -07:00
Robert Ly
ab2d681800
Merge "docs: fixing new superscript for rs" into honeycomb-mr2
2011-06-27 11:45:41 -07:00
Svetoslav Ganov
26460c7726
Merge "Added scroll and text selection change accessibility events."
2011-06-27 11:41:25 -07:00
Romain Guy
c5155a8238
Merge "Fixing various broken javadoc comments in framework."
2011-06-27 11:23:58 -07:00
Andreas Huber
25b8e5b673
Merge "Fix the new color converter to respect the destination crop rect."
2011-06-27 11:14:19 -07:00
Andreas Huber
7a1099d721
Merge "Log video dimensions and crop rectangle."
2011-06-27 11:14:12 -07:00
Andreas Huber
151e595f03
Merge "Update paths to test content used to run the omx_tests."
2011-06-27 11:14:05 -07:00
Andy McFadden
991bad3b31
Merge "Reduce definition of monthly rep test"
2011-06-27 11:07:40 -07:00
Dianne Hackborn
03148577bd
Merge "Turn on HW accel by default for apps that target ICS."
2011-06-27 10:40:41 -07:00
Chia-chi Yeh
6904f14b89
KeyStore: fix test-keystore
...
Change-Id: I1dcbd5c3cc7569c397d2480cda76288a9e28cd5c
2011-06-27 10:38:10 -07:00
James Dong
d2c1fb945d
Merge "Reduce the number of output buffers and force output buffers in display order for SoftAVC decoder"
2011-06-27 10:34:13 -07:00