OSDN Git Service
Gilles Debunne [Tue, 14 Jun 2011 00:09:12 +0000 (17:09 -0700)]
Merge "Switch is not affected by touch when disabled"
Chia-chi Yeh [Mon, 13 Jun 2011 23:17:03 +0000 (16:17 -0700)]
Merge "VPN: tolerate duplicated routes."
Chia-chi Yeh [Mon, 13 Jun 2011 23:11:58 +0000 (16:11 -0700)]
Merge "VPN: fix a bad optimization of zeroing ifr_flags lately."
Derek Sollenberger [Mon, 13 Jun 2011 22:42:47 +0000 (15:42 -0700)]
am
f11c52d2: Updates resulting from the Skia merge (revision 1327)
* commit '
f11c52d246d9e43c8533dff82979e7eeb72c1d50':
Updates resulting from the Skia merge (revision 1327)
Mathias Agopian [Mon, 13 Jun 2011 22:42:26 +0000 (15:42 -0700)]
am
c031afc8: (-s ours) am
77079399: am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
c031afc8e9ad6c940c7d67a15b9c53092987377e':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Jean-Baptiste Queru [Mon, 13 Jun 2011 22:42:10 +0000 (15:42 -0700)]
am
c793f521: Merge/Ignore
653fd9cf
* commit '
c793f521e5ace1dca39d65de3ed60d7c8242f661':
Moving flag to a member field instead of a stack variable.
Dan Morrill [Mon, 13 Jun 2011 22:41:56 +0000 (15:41 -0700)]
am
74e646ca: (-s ours) Fix merge conflict for \'
c2e1e329\'.
* commit '
74e646cab9a28aa3716a05fc474853c2c557f942':
Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
Chia-chi Yeh [Mon, 13 Jun 2011 22:38:20 +0000 (15:38 -0700)]
Merge "VPN: set IFF_NO_PI on TUN interface."
Chia-chi Yeh [Mon, 13 Jun 2011 22:08:43 +0000 (15:08 -0700)]
Merge "VPN: add MTU support."
Jamie Gennis [Mon, 13 Jun 2011 21:48:11 +0000 (14:48 -0700)]
Merge changes Ic9186db2,Id5a7cdff
* changes:
SurfaceTexture: disable a deadlocking test.
SurfaceTexture: add a pixel tolerance to the tests.
Chia-chi Yeh [Mon, 13 Jun 2011 21:35:12 +0000 (14:35 -0700)]
Merge "VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI."
Svetoslav Ganov [Mon, 13 Jun 2011 21:30:30 +0000 (14:30 -0700)]
Merge "Final polish of the interrogation feature."
Mathias Agopian [Mon, 13 Jun 2011 21:15:00 +0000 (14:15 -0700)]
am
77079399: am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
77079399fca3e9c71e2ac06f3da26934e1c278b9':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Mathias Agopian [Mon, 13 Jun 2011 21:13:21 +0000 (14:13 -0700)]
am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
RoboErik [Mon, 13 Jun 2011 20:59:38 +0000 (13:59 -0700)]
Merge "Remove @hide on SyncColumns, make them protected"
Mathias Agopian [Mon, 13 Jun 2011 01:05:53 +0000 (18:05 -0700)]
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Bug:
4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
Jamie Gennis [Mon, 13 Jun 2011 20:43:51 +0000 (13:43 -0700)]
SurfaceTexture: disable a deadlocking test.
This change disables the UpdateTexImageAfterFrameFinishedWorks test
because it's currently causing deadlocks on some devices.
Change-Id: Ic9186db207e8d656f3af5d86fa138c7d96393c55
Jamie Gennis [Mon, 13 Jun 2011 20:41:01 +0000 (13:41 -0700)]
SurfaceTexture: add a pixel tolerance to the tests.
This change adds a default tolerance of 2 to all the pixel value checks
in the SurfaceTexture tests.
Change-Id: Id5a7cdffdfae16076e2daf4964a3326105b5ae2c
RoboErik [Mon, 13 Jun 2011 20:32:17 +0000 (13:32 -0700)]
Merge "Make interfaces protected so they get included in api"
Jamie Gennis [Mon, 13 Jun 2011 19:32:46 +0000 (12:32 -0700)]
Merge "libutils: add a binary blob cache implementation."
Jean-Baptiste Queru [Mon, 13 Jun 2011 19:25:21 +0000 (12:25 -0700)]
Merge/Ignore
653fd9cf
Change-Id: Ia17ee5cace2d97d87de821a82d4412f6e60aac65
Martijn Coenen [Mon, 13 Jun 2011 19:19:01 +0000 (12:19 -0700)]
Merge "Support for setting the NfcA transceive timeout (API)."
Dan Morrill [Mon, 13 Jun 2011 18:59:38 +0000 (11:59 -0700)]
Fix merge conflict for '
c2e1e329'.
Conflicts:
core/res/res/values/config.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
Fabrice Di Meglio [Mon, 13 Jun 2011 18:43:12 +0000 (11:43 -0700)]
Merge "Update Configuration for renaming and fixes"
Jamie Gennis [Mon, 13 Jun 2011 18:14:57 +0000 (11:14 -0700)]
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.
Philip Milne [Mon, 13 Jun 2011 18:13:09 +0000 (11:13 -0700)]
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."
John Reck [Mon, 13 Jun 2011 18:12:03 +0000 (11:12 -0700)]
Merge "Tweaks for webview snap"
Irfan Sheriff [Mon, 13 Jun 2011 18:10:57 +0000 (11:10 -0700)]
Merge "Fix driver start/stop handling"
Teng-Hui Zhu [Mon, 13 Jun 2011 18:07:38 +0000 (11:07 -0700)]
Merge "Fix a NPE if the Chrome Client is not setup"
Jamie Gennis [Wed, 8 Jun 2011 16:40:45 +0000 (09:40 -0700)]
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
Jamie Gennis [Sun, 12 Jun 2011 21:11:39 +0000 (14:11 -0700)]
SurfaceTexture: fix up a comment.
Change-Id: I044e44e17319e08af657a7ec9fa39100876fe862
Jamie Gennis [Tue, 7 Jun 2011 22:23:23 +0000 (15:23 -0700)]
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
Jamie Gennis [Mon, 13 Jun 2011 00:03:06 +0000 (17:03 -0700)]
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
Ben Komalo [Mon, 13 Jun 2011 17:32:26 +0000 (10:32 -0700)]
Merge "Open up setKeyManager/setTrustManager."
Glenn Kasten [Mon, 13 Jun 2011 17:30:29 +0000 (10:30 -0700)]
Merge "Remove redundant memory barrier"
Daniel Sandler [Mon, 13 Jun 2011 14:30:48 +0000 (07:30 -0700)]
Merge "Use the new animated notification layout on tablets."
Daniel Sandler [Mon, 13 Jun 2011 14:29:39 +0000 (07:29 -0700)]
Merge "Rebuilt notification list using a new custom layout."
repo sync [Mon, 13 Jun 2011 10:09:27 +0000 (03:09 -0700)]
Merge "Fix the issue of onNetwork in UI thread."
Debashish Chatterjee [Mon, 13 Jun 2011 09:10:32 +0000 (02:10 -0700)]
Merge "Made VoicemailContract classes non-instantiable."
Jeff Sharkey [Mon, 13 Jun 2011 07:15:15 +0000 (00:15 -0700)]
Merge "Fix test-related build breakage."
Jeff Sharkey [Mon, 13 Jun 2011 06:24:50 +0000 (23:24 -0700)]
Merge "External mutation of full NetworkPolicy set."
Jeff Brown [Sun, 12 Jun 2011 22:25:14 +0000 (15:25 -0700)]
Merge "Ensure the RemoteViewsAdapter cleans up its HandlerThread."
Dan Morrill [Sat, 11 Jun 2011 16:52:50 +0000 (09:52 -0700)]
am
8688d470: Moving flag to a member field instead of a stack variable.
* commit '
8688d4708117db446d6ba2855f1d8ad715bb4d72':
Moving flag to a member field instead of a stack variable.
Jeff Sharkey [Sat, 11 Jun 2011 02:47:31 +0000 (19:47 -0700)]
Merge "Move data cycle methods to framework object."
Jeff Sharkey [Sat, 11 Jun 2011 02:41:33 +0000 (19:41 -0700)]
Merge "Interface-level network policy, persist policies."
Dianne Hackborn [Sat, 11 Jun 2011 02:24:49 +0000 (19:24 -0700)]
Merge "resolved conflicts for merge of
ed1a9c77 to master"
Dianne Hackborn [Sat, 11 Jun 2011 02:23:49 +0000 (19:23 -0700)]
resolved conflicts for merge of
ed1a9c77 to master
Change-Id: I0ecf8ca6deaee165eea3cc9012f8ae139f52ea0c
Jeff Brown [Sat, 11 Jun 2011 02:01:11 +0000 (19:01 -0700)]
Merge "Optimize StrictMode activity instance count check."
Jeff Brown [Sat, 11 Jun 2011 02:00:28 +0000 (19:00 -0700)]
Merge "Always clear the Message when recycled."
Jeff Brown [Sat, 11 Jun 2011 01:59:21 +0000 (18:59 -0700)]
Merge "Optimize orientation changes."
Jeff Brown [Sat, 11 Jun 2011 01:58:46 +0000 (18:58 -0700)]
Merge "Make orientation changes happen sooner."
Dianne Hackborn [Sat, 11 Jun 2011 01:42:12 +0000 (18:42 -0700)]
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.
Dianne Hackborn [Sat, 11 Jun 2011 01:39:48 +0000 (18:39 -0700)]
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.
Dianne Hackborn [Sat, 11 Jun 2011 01:37:22 +0000 (18:37 -0700)]
Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
Fabrice Di Meglio [Sat, 11 Jun 2011 01:22:55 +0000 (18:22 -0700)]
Merge "Refactor BiDiTest unit tests app"
Jim Miller [Sat, 11 Jun 2011 00:47:44 +0000 (17:47 -0700)]
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.
Jim Miller [Sat, 11 Jun 2011 00:43:37 +0000 (17:43 -0700)]
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.
Jim Miller [Sat, 11 Jun 2011 00:41:20 +0000 (17:41 -0700)]
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.
Romain Guy [Sat, 11 Jun 2011 00:32:40 +0000 (17:32 -0700)]
Merge "Add missing API to current.txt"
John Wang [Sat, 11 Jun 2011 00:31:42 +0000 (17:31 -0700)]
am
cc44bea0: am
2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
* commit '
cc44bea0400bc6b6e995d66b705a4db0a77a7dfa':
Add toString for IccCard Status and App.
John Wang [Sat, 11 Jun 2011 00:28:11 +0000 (17:28 -0700)]
am
2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
* commit '
2addaf97b319e257677ac3e5bbb772ba40cfa78a':
Add toString for IccCard Status and App.
John Wang [Sat, 11 Jun 2011 00:19:42 +0000 (17:19 -0700)]
Merge "Add toString for IccCard Status and App." into honeycomb-LTE
Glenn Kasten [Thu, 2 Jun 2011 15:59:28 +0000 (08:59 -0700)]
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
James Dong [Fri, 10 Jun 2011 23:23:41 +0000 (16:23 -0700)]
Merge "Avoid duplicated code calculating the stts sample duration"
Romain Guy [Fri, 10 Jun 2011 22:45:23 +0000 (15:45 -0700)]
Merge "Add onSurfaceTextureDestroyed() callback."
Fabrice Di Meglio [Fri, 10 Jun 2011 22:45:10 +0000 (15:45 -0700)]
Merge "Make View respect LAYOUT_DIRECTION_LOCALE"
Nick Pelly [Fri, 10 Jun 2011 22:23:37 +0000 (15:23 -0700)]
Merge "NFC: Submit the missing pieces of previous commit to fix build."
Teng-Hui Zhu [Fri, 10 Jun 2011 22:21:26 +0000 (15:21 -0700)]
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
Robert Greenwalt [Fri, 10 Jun 2011 22:21:22 +0000 (15:21 -0700)]
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
John Reck [Fri, 10 Jun 2011 21:57:33 +0000 (14:57 -0700)]
Merge "Tweak snap settings"
Teng-Hui Zhu [Fri, 10 Jun 2011 21:27:13 +0000 (14:27 -0700)]
am
b5141a9f: am
90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit '
b5141a9fc7e841167c3e07f8797d8aef9a787d25':
fix one NPE when webChromeClient don't have progress view support
Jean-Baptiste Queru [Fri, 10 Jun 2011 21:27:01 +0000 (14:27 -0700)]
Merge "Make AllAudio really include all audio"
Teng-Hui Zhu [Fri, 10 Jun 2011 21:22:52 +0000 (14:22 -0700)]
am
90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit '
90bdb69bf95e5865547a55260dd61744b0bcc911':
fix one NPE when webChromeClient don't have progress view support
Teng-Hui Zhu [Fri, 10 Jun 2011 21:19:22 +0000 (14:19 -0700)]
Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2
Shimeng (Simon) Wang [Fri, 10 Jun 2011 21:13:36 +0000 (14:13 -0700)]
Merge "Fix reflow for mobile sites."
Robert Greenwalt [Fri, 10 Jun 2011 21:13:25 +0000 (14:13 -0700)]
am
1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
* commit '
1ea549e8990d2d73ccd9e92db1e7312423ee423e':
CDMALTE: Get roaming status based on SID/NID
Brian Carlstrom [Fri, 10 Jun 2011 21:11:15 +0000 (14:11 -0700)]
Merge "New KeyChain API for application access to keystore credentials"
Dianne Hackborn [Fri, 10 Jun 2011 21:08:49 +0000 (14:08 -0700)]
am
0a63ccc6: am
5624b793: am
2bb2d48f: Commit final (maybe) MR 2 API.
* commit '
0a63ccc63b833e8034cc941bf55a6e2003037309':
Commit final (maybe) MR 2 API.
Dianne Hackborn [Fri, 10 Jun 2011 21:08:45 +0000 (14:08 -0700)]
Dianne Hackborn [Fri, 10 Jun 2011 21:08:41 +0000 (14:08 -0700)]
am
f14dff12: am
c6adfed6: am
f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit '
f14dff1219d2a87340dccad657f666f5451d8c6e':
Okay *now* really enforce the limit on non-public styles.
Robert Greenwalt [Fri, 10 Jun 2011 21:08:28 +0000 (14:08 -0700)]
Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
Nick Pelly [Fri, 10 Jun 2011 20:55:36 +0000 (13:55 -0700)]
Merge "NfcAdapter: Remove dead AIDL methods."
John Reck [Fri, 10 Jun 2011 20:10:52 +0000 (13:10 -0700)]
Merge "Expose hook for crash backup"
Dianne Hackborn [Fri, 10 Jun 2011 20:00:41 +0000 (13:00 -0700)]
am
9980043e: am
820caf7b: am
8821ba86: Ummm... f*, stop breaking the build.
* commit '
9980043e930f877c4cd066de2b3d57dce4fc926e':
Ummm... f*, stop breaking the build.
Dianne Hackborn [Fri, 10 Jun 2011 19:47:12 +0000 (12:47 -0700)]
Merge "resolved conflicts for merge of
f51ded0f to master"
Dianne Hackborn [Fri, 10 Jun 2011 19:45:36 +0000 (12:45 -0700)]
resolved conflicts for merge of
f51ded0f to master
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
Adam Powell [Fri, 10 Jun 2011 18:59:03 +0000 (11:59 -0700)]
Merge "Fix some measurement/sizing with split action bars"
Philip Milne [Fri, 10 Jun 2011 18:54:39 +0000 (11:54 -0700)]
Merge "Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices."
RoboErik [Fri, 10 Jun 2011 18:36:15 +0000 (11:36 -0700)]
Merge "Upgrade of Calendar db to 305"
Dan Morrill [Fri, 10 Jun 2011 18:01:48 +0000 (11:01 -0700)]
Merge "Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to master do to a merge conflict oversight."
Chet Haase [Fri, 10 Jun 2011 17:58:26 +0000 (10:58 -0700)]
Merge "Change Property.set() to throw UnsupportedOperationException by default"
Robert Greenwalt [Fri, 10 Jun 2011 17:33:23 +0000 (10:33 -0700)]
am
5a8455c3: am
75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE
* commit '
5a8455c3c625201f3ae6b9ce32913bf97ba61cc8':
Set locale based on SIM preferred language.
James Dong [Fri, 10 Jun 2011 17:32:21 +0000 (10:32 -0700)]
am
dc03da04: (-s ours) am
2488a943: am
e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit '
dc03da0444803983aef4988475f2d5dcdf0283e9':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
Mike Lockwood [Fri, 10 Jun 2011 17:32:16 +0000 (10:32 -0700)]
am
6d60190a: am
e502c536: am
b3174c46: UsbService: Fix JNI reference leak
* commit '
6d60190a3156e0ac69c800bbb10691b70ae9bd54':
UsbService: Fix JNI reference leak
Justin Ho [Fri, 10 Jun 2011 17:32:10 +0000 (10:32 -0700)]
am
e9f203e4: am
9b0a8f9a: am
1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit '
e9f203e44363f0ee035aa2cd6aad3d5680e6c94f':
Updating default wallpaper of large devices to match xlarge
Xavier Ducrohet [Fri, 10 Jun 2011 17:31:52 +0000 (10:31 -0700)]
am
48305f32: am
2e0f7118: am
8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '
48305f327ff3839ddbfa5a6fb42a57150a69480c':
Merge
06942bc4 from hc-mr1.
Merge
988eeeb5 from hc-mr1.
Conley Owens [Fri, 10 Jun 2011 17:30:38 +0000 (10:30 -0700)]
am
e668c0b6: (-s ours) am
644f36ea: am
d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit '
e668c0b69896996040f394e0a95f71dd4b9c6257':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
Ben Komalo [Fri, 10 Jun 2011 17:17:34 +0000 (10:17 -0700)]
Merge "New device policy to disable camera."
Jamie Gennis [Fri, 10 Jun 2011 17:05:04 +0000 (10:05 -0700)]
Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder."
James Dong [Fri, 10 Jun 2011 16:57:01 +0000 (09:57 -0700)]
Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition"