RoboErik
6ac2ba7aae
Merge "Remove @hide on SyncColumns, make them protected"
2011-06-13 13:59:38 -07:00
RoboErik
ecbb9dbce4
Merge "Make interfaces protected so they get included in api"
2011-06-13 13:32:17 -07:00
Jamie Gennis
ac642349ba
Merge "libutils: add a binary blob cache implementation."
2011-06-13 12:32:46 -07:00
Martijn Coenen
4bcd592df7
Merge "Support for setting the NfcA transceive timeout (API)."
2011-06-13 12:19:01 -07:00
Fabrice Di Meglio
e568a00d65
Merge "Update Configuration for renaming and fixes"
2011-06-13 11:43:12 -07:00
Jamie Gennis
72f6af8630
Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8
...
* changes:
SurfaceTexture: add some GL->GL tests.
SurfaceTexture: fix up a comment.
SurfaceTexture: add getTransformMatrix tests.
SurfaceTexture: fix a getTransformMatrix crash.
2011-06-13 11:14:57 -07:00
Philip Milne
1033f1dc02
Merge "Bugfix for GridLayout assuming that the x value of last column index is maximal. This is not the case when column indexes are defined incorrectly and GridLayout should still work in this case."
2011-06-13 11:13:09 -07:00
John Reck
51b0bb40ad
Merge "Tweaks for webview snap"
2011-06-13 11:12:03 -07:00
Irfan Sheriff
75a41685a0
Merge "Fix driver start/stop handling"
2011-06-13 11:10:57 -07:00
Teng-Hui Zhu
eb237381a9
Merge "Fix a NPE if the Chrome Client is not setup"
2011-06-13 11:07:38 -07:00
Jamie Gennis
5451d15ee2
SurfaceTexture: add some GL->GL tests.
...
This change adds some tests to verify streaming images from one GL
thread to another via SurfaceTexture. Currently the tests do not
validate the correctness of the streamed images, but rather simply
verify that this streaming does not cause a deadlock. 3 of the 4 tests
are currently disabled because they do cause deadlocks on some devices.
Change-Id: I5677942053190063b97f370dba96c116711bc3bb
2011-06-13 10:50:13 -07:00
Jamie Gennis
ae468f4341
SurfaceTexture: fix up a comment.
...
Change-Id: I044e44e17319e08af657a7ec9fa39100876fe862
2011-06-13 10:50:13 -07:00
Jamie Gennis
5222604809
SurfaceTexture: add getTransformMatrix tests.
...
This change adds a test verifying that with no transform set on the
SurfaceTextureClient, the SurfaceTexture will return an identity
transform matrix. It also verifies this same effect in the presence of
an additional call to native_window_set_buffer_count just before the
call to getTransformMatrix.
Bug: 4490420
Change-Id: Ic5adfa29b5696cc2b451433834e3758ef20c5edd
2011-06-13 10:50:13 -07:00
Jamie Gennis
736aa9573b
SurfaceTexture: fix a getTransformMatrix crash.
...
This change moves the computation of the transform matrix out of
getTransformMatrix and instead performs the computation when
updateTexImage gets called. This is needed in order for
getTransformMatrix to succeed even if the buffers have been freed (e.g.
by changing the buffer count) because the computation depends upon the
properties of the current GraphicBuffer.
Change-Id: Ied541ab8747b7ad604f862717135f9a16a816be9
Bug: 4490420
2011-06-13 10:50:12 -07:00
Ben Komalo
89fcdba6bc
Merge "Open up setKeyManager/setTrustManager."
2011-06-13 10:32:26 -07:00
Glenn Kasten
c4a0feaaf4
Merge "Remove redundant memory barrier"
2011-06-13 10:30:29 -07:00
Daniel Sandler
a23a53296f
Merge "Use the new animated notification layout on tablets."
2011-06-13 07:30:48 -07:00
Daniel Sandler
b8be6d9491
Merge "Rebuilt notification list using a new custom layout."
2011-06-13 07:29:39 -07:00
repo sync
052d012ccc
Merge "Fix the issue of onNetwork in UI thread."
2011-06-13 03:09:27 -07:00
Debashish Chatterjee
14ce0f90c5
Merge "Made VoicemailContract classes non-instantiable."
2011-06-13 02:10:32 -07:00
Jeff Sharkey
3a62a45f8e
Merge "Fix test-related build breakage."
2011-06-13 00:15:15 -07:00
Jeff Sharkey
cd5c0cc63a
Merge "External mutation of full NetworkPolicy set."
2011-06-12 23:24:50 -07:00
Jeff Brown
d45ae3c679
Merge "Ensure the RemoteViewsAdapter cleans up its HandlerThread."
2011-06-12 15:25:14 -07:00
Jeff Sharkey
88181e1c3d
Merge "Move data cycle methods to framework object."
2011-06-10 19:47:31 -07:00
Jeff Sharkey
ec4bdaed57
Merge "Interface-level network policy, persist policies."
2011-06-10 19:41:33 -07:00
Dianne Hackborn
f497b67940
Merge "resolved conflicts for merge of ed1a9c77 to master"
2011-06-10 19:24:49 -07:00
Dianne Hackborn
24da0e5f3a
resolved conflicts for merge of ed1a9c77 to master
...
Change-Id: I0ecf8ca6deaee165eea3cc9012f8ae139f52ea0c
2011-06-10 19:23:49 -07:00
Jeff Brown
c31d5be0c6
Merge "Optimize StrictMode activity instance count check."
2011-06-10 19:01:11 -07:00
Jeff Brown
3745a0d8a4
Merge "Always clear the Message when recycled."
2011-06-10 19:00:28 -07:00
Jeff Brown
e7be32b838
Merge "Optimize orientation changes."
2011-06-10 18:59:21 -07:00
Jeff Brown
b1963be02a
Merge "Make orientation changes happen sooner."
2011-06-10 18:58:46 -07:00
Dianne Hackborn
ff66c00bc6
am fc441bff: am fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
...
* commit 'fc441bfff9eb68be08eb922ea05c78c5d6fba27a':
Fix some problems with moving in and out of detached state.
2011-06-10 18:42:12 -07:00
Dianne Hackborn
37cb1b9f25
am fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
...
* commit 'fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6':
Fix some problems with moving in and out of detached state.
2011-06-10 18:39:48 -07:00
Dianne Hackborn
fcd83591ff
Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
2011-06-10 18:37:22 -07:00
Fabrice Di Meglio
80a743c936
Merge "Refactor BiDiTest unit tests app"
2011-06-10 18:22:55 -07:00
Jim Miller
3d14211912
am db26be1f: am 5fe24ec7: am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM.
...
* commit 'db26be1fa63e838b83e060a5e8a102321b9385fb':
Fix layout issue on table when device thinks there's a SIM.
2011-06-10 17:47:44 -07:00
Jim Miller
56eba87a32
am 5fe24ec7: am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM.
...
* commit '5fe24ec77d183774dfb06262b80b32be608480c7':
Fix layout issue on table when device thinks there's a SIM.
2011-06-10 17:43:37 -07:00
Jim Miller
ad83ca0f9d
am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM.
...
* commit '8daefb9c63cce5e0a87ba38c40dd4f48be3809e1':
Fix layout issue on table when device thinks there's a SIM.
2011-06-10 17:41:20 -07:00
Romain Guy
139a183e18
Merge "Add missing API to current.txt"
2011-06-10 17:32:40 -07:00
John Wang
e517224f53
am cc44bea0: am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
...
* commit 'cc44bea0400bc6b6e995d66b705a4db0a77a7dfa':
Add toString for IccCard Status and App.
2011-06-10 17:31:42 -07:00
John Wang
b063ccebcb
am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
...
* commit '2addaf97b319e257677ac3e5bbb772ba40cfa78a':
Add toString for IccCard Status and App.
2011-06-10 17:28:11 -07:00
John Wang
f3ae02f82a
Merge "Add toString for IccCard Status and App." into honeycomb-LTE
2011-06-10 17:19:42 -07:00
Glenn Kasten
d9e1bb76fe
Remove redundant memory barrier
...
pthread_create already includes the necessary memory barriers:
- parent at pthread_create : pthread_mutex_unlock(start_mutex)
- child at __thread_entry : pthread_mutex_lock(start_mutex)
Add lock around uses of mThread.
Added comments:
- uses of mThread require lock
- androidCreateRawThreadEtc returned ID is not safe for direct use from non-parent threads.
Change-Id: I18cb296b41ddaf64cf127b57aab31154319b5970
2011-06-10 17:07:46 -07:00
James Dong
0290d32991
Merge "Avoid duplicated code calculating the stts sample duration"
2011-06-10 16:23:41 -07:00
Romain Guy
aec4309e80
Merge "Add onSurfaceTextureDestroyed() callback."
2011-06-10 15:45:23 -07:00
Fabrice Di Meglio
ce72c1d1d1
Merge "Make View respect LAYOUT_DIRECTION_LOCALE"
2011-06-10 15:45:10 -07:00
Nick Pelly
bb3a9c3304
Merge "NFC: Submit the missing pieces of previous commit to fix build."
2011-06-10 15:23:37 -07:00
Teng-Hui Zhu
80217940d7
am 5a9bbc34: am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
...
* commit '5a9bbc34cb2a83188b7407c4f7bae47e40593c34':
fix one NPE when webChromeClient don't have progress view support
2011-06-10 15:21:26 -07:00
Robert Greenwalt
205c0b3f21
am 75612e9c: am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
...
* commit '75612e9c3f92364ba1f0a7fce46f1df11b0a14ca':
CDMALTE: Get roaming status based on SID/NID
2011-06-10 15:21:22 -07:00
John Reck
4827e4870f
Merge "Tweak snap settings"
2011-06-10 14:57:33 -07:00