Mathias Agopian
e0be194c7b
am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
...
* commit '74da537f80ba36c1279c04fcb85d89fc38c246a6':
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
2010-12-08 16:15:08 -08:00
Mathias Agopian
fc84e8269b
Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread
2010-12-08 15:08:33 -08:00
Brad Fitzpatrick
638ea56494
am 36af7943: Fix malformed Javadoc.
...
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
Fix malformed Javadoc.
2010-12-08 13:23:03 -08:00
Nick Pelly
1f5a356bd1
am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
...
* commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8':
Implemented getSize() to return max ndef size.
2010-12-07 22:57:23 -08:00
Nick Pelly
ce561faf57
Merge "Implemented getSize() to return max ndef size." into gingerbread
2010-12-07 22:55:21 -08:00
Martijn Coenen
8d591a9d1e
am 5289b91c: Implement ndef formatting.
...
* commit '5289b91c885158094988a9a7b51b3139565eb639':
Implement ndef formatting.
2010-12-07 22:35:01 -08:00
Wink Saville
e7bdce57c2
am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
...
* commit 'a00d89e824c523c51955176b61e50472828fd8b1':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 22:22:01 -08:00
Wink Saville
9d6ca87ee1
am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
...
* commit '2b858caecb3c293c47b48eed12a55a49e3039874':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 22:18:14 -08:00
Dianne Hackborn
759355403e
am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
...
* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
Add more checks for bad values to protect from corrupt files.
2010-12-07 22:07:40 -08:00
Dianne Hackborn
84d86eb52b
Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
2010-12-07 22:04:38 -08:00
Wink Saville
b56a7b062d
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
2010-12-07 21:57:53 -08:00
Mathias Agopian
e24cc7a38d
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
...
In some situations, the screen transformation would not be
applied while in bypass mode.
Change-Id: I3d6dd52e4c12b11aae97b54bf8e2322536eee37f
2010-12-07 21:16:14 -08:00
Mathias Agopian
e4f81090c2
am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
...
* commit 'a2977c383d363e1e88a5b36230b1fa4c312807d2':
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[3171580] Add transform field to native buffers. (DO NOT MERGE)
2010-12-07 14:22:56 -08:00
Mathias Agopian
9669d23cae
am 05813b0e: Merge changes I244b5469,I32044e91 into gingerbread
...
* commit '05813b0eb92cb1bc79607ee402f14ca1e4b43f6d':
[3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[3171580] Fix two typos related to fixed-size buffers
2010-12-07 14:20:14 -08:00
Mathias Agopian
372c56e98b
am 4153bf3a: Merge "[3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread
...
* commit '4153bf3a259624a2f2dc497b77b225a1fb517abc':
[3171580] don't automatically log GraphicBuffer allocation failures
2010-12-07 14:20:09 -08:00
Mathias Agopian
db13e364f9
Merge changes Ie03796ae,Ide3e980a into gingerbread
...
* changes:
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[3171580] Add transform field to native buffers. (DO NOT MERGE)
2010-12-07 14:18:56 -08:00
Mathias Agopian
c24928fd6f
Merge changes I244b5469,I32044e91 into gingerbread
...
* changes:
[3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[3171580] Fix two typos related to fixed-size buffers
2010-12-07 14:18:21 -08:00
Mathias Agopian
abf06a734f
Merge "[3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread
2010-12-07 14:17:47 -08:00
Jeff Hamilton
a023749ff2
am 0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread
...
* commit '0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
Remove Type X Tags from the top-level API.
2010-12-07 14:04:40 -08:00
Daniel Sandler
b8f98c9045
am f340d082: Merge "More precise status bar battery icons." into gingerbread
...
* commit 'f340d082b8488de6f131c1e5932cd3abc16b47c1':
More precise status bar battery icons.
2010-12-07 14:01:31 -08:00
Jeff Hamilton
3846f7a9b6
Merge "Remove Type X Tags from the top-level API." into gingerbread
2010-12-07 13:59:29 -08:00
Jean-Baptiste Queru
82b2a4b94c
am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master
...
* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
Strings for NI position request are moved to resources
2010-12-07 13:02:22 -08:00
Jean-Baptiste Queru
f83c5e5eee
resolved conflicts for merge of 78742e01 to stage-korg-master
...
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
2010-12-07 12:51:49 -08:00
Daniel Sandler
6f14ecd361
Merge "More precise status bar battery icons." into gingerbread
2010-12-07 12:03:36 -08:00
Jean-Baptiste Queru
d4d1d5a02b
Merge "Strings for NI position request are moved to resources"
2010-12-07 12:01:25 -08:00
Nick Pelly
1218a4a2c4
am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
...
* commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c':
Corrected MIFARE default key set
2010-12-07 09:34:47 -08:00
Nick Pelly
95e4f1e8b3
Merge "Corrected MIFARE default key set" into gingerbread
2010-12-07 09:29:21 -08:00
Chung-yih Wang
b15b1a5a49
am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
...
* commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a':
Fix SIP bug of different transport/port used for requests.
2010-12-06 22:10:29 -08:00
Chung-yih Wang
823f079024
Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
2010-12-06 22:07:59 -08:00
Dirk Dougherty
06fda4c65c
am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
...
* commit '0871ee0c6f43a7201ce49a66211c1c850eabeb6b':
Doc change: fix href to axis_globe_inverted orientation diagram.
2010-12-06 19:44:36 -08:00
Martijn Coenen
6a96815d8b
am 9a9706a2: Added missing ndef technology to getTech.
...
* commit '9a9706a213637b396226afff53c69927283609a7':
Added missing ndef technology to getTech.
2010-12-06 18:48:02 -08:00
Nick Pelly
d9e8d48bf5
am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
...
* commit 'e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
Added NdefFormatable tag, initial class with supported methods.
2010-12-06 18:44:13 -08:00
Nick Pelly
7592f8f4d8
Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
2010-12-06 18:41:36 -08:00
Mathias Agopian
d6a9c7d2db
am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
...
* commit 'daef0a040de7a9825bdbcba7b2eae66195e3a95f':
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
2010-12-06 18:22:57 -08:00
Mathias Agopian
f219856d5e
Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread
2010-12-06 18:20:09 -08:00
Nick Pelly
15296b5486
am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
...
* commit 'eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
2010-12-06 17:45:25 -08:00
Nick Pelly
2361dd244d
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
2010-12-06 17:43:46 -08:00
James Dong
02524f3b89
am d57fbe88: Fixed a race condition where some recording frames may not be released
...
* commit 'd57fbe887fabd027e644caeaa2139c863143a786':
Fixed a race condition where some recording frames may not be released
2010-12-06 15:36:04 -08:00
Jean-Baptiste Queru
13fd790454
am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1ee2394edd4b90111f8174862c7c0f435e1a3634':
Changing connect and response timeout.
2010-12-06 13:46:19 -08:00
Jean-Baptiste Queru
64b556bdc9
am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
2010-12-06 13:43:36 -08:00
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