Jean-Baptiste Queru
58b879a8f6
Merge "Changing connect and response timeout."
2010-12-06 13:39:19 -08:00
Jean-Baptiste Queru
32f0f53d40
am 005dd44b: am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
NumberPicker: Set formatter local value to US.
2010-12-06 11:05:47 -08:00
Jean-Baptiste Queru
9d2e1882cb
am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
907333ec69
Merge "NumberPicker: Set formatter local value to US."
2010-12-06 10:57:04 -08:00
Jeff Hamilton
a01ed4d6ac
am c1576ad6: Update the docs to clarify the ordering constraints.
...
* commit 'c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
Update the docs to clarify the ordering constraints.
2010-12-05 20:03:59 -08:00
Nick Pelly
be0ed98e3a
am 3d524e56: Merge gingerbread-nfc into gingerbread
...
* commit '3d524e562606e7994ede3429b37937f40f94cd41':
First implementation of MifareUltralight
2010-12-05 18:13:10 -08:00
Nick Pelly
4995b0cd7e
Merge gingerbread-nfc into gingerbread
2010-12-05 18:08:16 -08:00
Nick Pelly
3d3f99de94
am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
...
* commit 'd8c323321c28a0a5ff70c6e0694aa822edca4005':
Fixed technology name typo's.
Implement historical bytes / attrib on IsoDep
Provide system code and manufacturer code for Felica tech.
Fixed NfcAdapter init and getTechnology().
Secure Element access implementation
Rough first pass at the NFC technology API.
Revert "Merge "Remove the My Tag feature." into gingerbread"
2010-12-05 14:49:00 -08:00
Nick Pelly
54c9d4a79a
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
2010-12-05 14:46:29 -08:00
Nick Pelly
130f48f5bc
Merge branch gingerbread-nfc into gingerbread.
...
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
2010-12-05 14:45:29 -08:00
Irfan Sheriff
fe1b942d68
am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
...
* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
DO NOT MERGE Avoid nullifying dhcp target
2010-12-04 23:45:18 -08:00
Irfan Sheriff
10484ac22a
Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
2010-12-03 17:58:17 -08:00
Mathias Agopian
22c67843be
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
...
This is a poor's man precursor to the h/w composer HAL.
Basically we detect when a window is full screen and in
that case we bypass surfaceflinger's composition step, which
yields to much improved performance.
Change-Id: Ie03796ae81a1c951949b771c9323044b980cb347
2010-12-03 17:35:07 -08:00
Mathias Agopian
30eb1b1803
[3171580] Add transform field to native buffers. (DO NOT MERGE)
...
This field indicate how the content of the buffer
needs to be transformed.
Change-Id: Ide3e980a90599e931406135693231276626adbbb
2010-12-03 17:35:07 -08:00
Mathias Agopian
733189d408
[3171580] Fix two typos related to fixed-size buffers
...
mFixedSize was never set, this bug was introduced during some "cleanup", in
practice this could cause some issues when a fixed-size buffer was used and
the window was resized.
Layer::drawForSreenShot() had a typo that had no effect.
mFixedSize was used to determine if filtering was needed, which was a bit too
conservative and created a dependency between filtering and "fixed size" states
which should exist.
Now we enable filtering based on the size of the buffer vs. the size of the layer.
Change-Id: I32044e91b0c944c1b137efdceb3f01dfaa78119d
2010-12-03 17:35:06 -08:00
Mathias Agopian
678bdd6349
[3171580] don't automatically log GraphicBuffer allocation failures
...
some of these failures are not fatal and even expected in some cases
so they should not emit a dump in the log in those cases.
Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
2010-12-03 17:33:09 -08:00
Mathias Agopian
644bb2a29e
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
...
(there are multiple bugs this should fix)
we now use the EGL_NATIVE_VISUAL_ID of a config to set
the ANativeWindow's format from eglCreateWindowSurface(),
this guarantees that the surface's format will match
whatever EGLConfig the user chose.
this should fix all current and future config/surface format
mismatch and allow users to easily select 32-bits surfaces.
Change-Id: I3835d0eb70c75eeecded3c3509a0a8207554c98b
2010-12-03 14:15:40 -08:00
Hung-ying Tyan
d76844ac80
am e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
...
* commit 'e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c':
Set AudioGroup mode according to audio settings
2010-12-02 17:56:40 -08:00
Hung-ying Tyan
33f4f32967
Merge "Set AudioGroup mode according to audio settings" into gingerbread
2010-12-02 17:50:33 -08:00
Jean-Baptiste Queru
438267d997
am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master
...
* commit '4a88013a4a06a9ea80e8419f94694936e6b013f0':
Preserve flags field of event passed to injectKeyEvent()
2010-12-02 15:21:35 -08:00
Jean-Baptiste Queru
a4130babac
resolved conflicts for merge of bf1439c5 to stage-korg-master
...
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
2010-12-02 15:16:53 -08:00
Jean-Baptiste Queru
7a039f9994
Merge "Preserve flags field of event passed to injectKeyEvent()"
2010-12-02 14:56:13 -08:00
Xia Wang
784a43fef7
am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
...
* commit '3591bebd5957a8547fc54659179a19440636e7f9':
Restore Wi-Fi configuration after the test. DO NOT MERGE
2010-12-02 13:44:54 -08:00
Xia Wang
147abbd117
Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
2010-12-02 13:40:23 -08:00
James Dong
dc76df85d7
am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread
...
* commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74':
Be conservative in estimating the file size limit.
2010-12-02 10:21:06 -08:00
James Dong
11cdf95594
Merge "Be conservative in estimating the file size limit." into gingerbread
2010-12-02 10:13:36 -08:00
Jean-Baptiste Queru
34f9603301
am 40eade14: Merge from open-source master
...
* commit '40eade14bb87d24903588de04449fdfe2e1795cb':
Fix crash by "adb shell pm list permissions -f|-s"
2010-12-02 07:59:52 -08:00
Jean-Baptiste Queru
9ee1ec38a6
am 077bc4ac: Merge from open-source master
...
* commit '077bc4ac019ad33abd613448e11d3ad501218991':
Fix HTTP redirect missing statuscode 303 and 307
2010-12-02 07:59:49 -08:00
Jean-Baptiste Queru
4bdada2c61
Merge from open-source master
...
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
af8964280b
Merge from open-source master
...
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
2010-12-02 07:54:57 -08:00
Jeff Hamilton
1c79a55b61
Merge remote branch 'ohd/gingerbread' into merge
2010-12-02 09:41:16 -06:00
Eric Laurent
51e91ae24e
am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
...
* commit '78d81851a8ef6691541215afb19e5bc690a4c3c0':
Fix issue 2641884: Bluetooth volume is dependent on in call volume.
2010-12-01 16:04:09 -08:00
Eric Laurent
8217671a50
Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
2010-12-01 15:59:31 -08:00
Kenny Root
5a1ed2a762
am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
...
* commit '938d097263416ad416ee995e62dab559ea50bf0d':
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-01 14:20:49 -08:00
Kenny Root
8e41fd2aa5
Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
2010-12-01 14:18:23 -08:00
Scott Main
0da9cbe3f7
am 83df6ead: am a45d6937: docs: dashboard update
...
* commit '83df6ead8dfd2037e4681793d439fffa5afda9fc':
docs: dashboard update
2010-12-01 13:59:08 -08:00
Irfan Sheriff
c4b9bf2454
am f36bde82: DO NOT MERGE Dont let supplicant stay in DORMANT state
...
* commit 'f36bde828c0e427c0dbbe543b2465114c9aff45c':
DO NOT MERGE Dont let supplicant stay in DORMANT state
2010-12-01 13:59:04 -08:00
Scott Main
1e0f732364
am a45d6937: docs: dashboard update
...
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
docs: dashboard update
2010-12-01 12:59:42 -08:00
Eric Laurent
54a176320f
am e23212bc: Merge "Fix issue 3142808." into gingerbread
...
* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
Fix issue 3142808.
2010-12-01 11:28:54 -08:00
Eric Laurent
4db2fd929a
Merge "Fix issue 3142808." into gingerbread
2010-12-01 11:26:37 -08:00
John Wang
cec24879b4
am 4567847d: Add "canDial" check.
...
* commit '4567847d461afac08a80518637a0e48eff3c5247':
Add "canDial" check.
2010-12-01 11:10:42 -08:00
Irfan Sheriff
2f28b822da
resolved conflicts for merge of 52556689 to gingerbread-plus-aosp
...
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
2010-12-01 10:40:05 -08:00
Irfan Sheriff
a29e6d9620
Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread
2010-12-01 10:17:56 -08:00
Irfan Sheriff
d8567ca26c
am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
...
* commit 'af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:53:17 -08:00
Irfan Sheriff
d4d5dab12f
Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
2010-12-01 09:51:27 -08:00
Jean-Baptiste Queru
6c48212132
Merge "Fix crash by "adb shell pm list permissions -f|-s""
2010-12-01 09:47:14 -08:00
Brad Fitzpatrick
994caa76a1
am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
...
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
e5f05b8739
Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread
2010-12-01 08:46:52 -08:00
Jean-Baptiste Queru
459ae1107f
Merge "Fix HTTP redirect missing statuscode 303 and 307"
2010-12-01 08:25:12 -08:00
Hung-ying Tyan
930f716d99
am 06e8cdc0: Fix race between ending and answering a SIP call.
...
* commit '06e8cdc0f81ead604d5adf9d7b3f982e10226fd2':
Fix race between ending and answering a SIP call.
2010-11-30 23:21:40 -08:00