12919 Commits

Author SHA1 Message Date
Robert Greenwalt
aa3866e6fa am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
2011-01-29 06:55:38 -08:00
Robert Greenwalt
6b739dc729 Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Robert Greenwalt
e12aec941d Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
2011-01-28 14:48:37 -08:00
Eric Fischer
287fbba5b8 am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
  Import revised translations.  DO NOT MERGE
2011-01-28 14:19:36 -08:00
Eric Fischer
1c3f1af182 Import revised translations. DO NOT MERGE
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
2011-01-28 13:16:00 -08:00
Nick Pelly
34afc2cd83 am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread
* commit 'd350dc0492fab3614749955f5dcf21ec1c522b24':
  API: Make close() throw an IOException.
2011-01-27 16:26:28 -08:00
Nick Pelly
d350dc0492 Merge "API: Make close() throw an IOException." into gingerbread 2011-01-27 16:23:35 -08:00
Nick Pelly
3fcedf7728 API: Make close() throw an IOException.
IOException on close() can be useful to indicate that in-progress transactions
were canceled.

I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.

Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
2011-01-27 16:17:14 -08:00
Eric Fischer
e49e30cc4d am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
  Import revised translations.  DO NOT MERGE
2011-01-27 15:00:43 -08:00
Eric Fischer
3d73c4d386 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-27 14:56:29 -08:00
Nick Pelly
32f7d50df1 am 21d0a173: Fix build - javadoc.
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
2011-01-27 14:12:49 -08:00
Nick Pelly
21d0a173f1 Fix build - javadoc.
Change-Id: I0168fb4a75f4dff88e347c0dfd1f0b39e2dba0d6
2011-01-27 14:07:50 -08:00
Eric Fischer
f4323d8d6a Import revised translations. DO NOT MERGE
Change-Id: I1cf12c4a061a7982666176b42ac68d6dedd207ed
2011-01-27 13:57:31 -08:00
Nick Pelly
55e124c448 am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread
* commit 'eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
  Clean up MifareUltralight API.
2011-01-27 13:25:52 -08:00
Nick Pelly
eab0e97bf0 Merge "Clean up MifareUltralight API." into gingerbread 2011-01-27 12:23:53 -08:00
Nick Pelly
4a5e253220 Clean up MifareUltralight API.
o Some javadoc updates
o writeBlock -> writePages  (Block means something else in NFC Forum).
o validate page offset

Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
2011-01-27 12:22:56 -08:00
Robert Greenwalt
b27ce98451 am 89a54408: Merge "Update networktype before sending state change." into gingerbread
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
  Update networktype before sending state change.
2011-01-27 10:20:33 -08:00
Robert Greenwalt
89a544088f Merge "Update networktype before sending state change." into gingerbread 2011-01-27 10:17:33 -08:00
Dianne Hackborn
ccd79399cc am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
  Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:08:30 -08:00
Robert Greenwalt
67881c414a Update networktype before sending state change.
Fixes potential race condition in network-type info.  May fix this issue.

bug:3376930
Change-Id: I3d5fd7c76e54923b62c56defa947be3c9c1cd585
2011-01-26 13:39:46 -08:00
Dianne Hackborn
f5e4f208b9 Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Change-Id: I53a6671d5478e7dbca44b17d90f1edfa8e3420bc
2011-01-26 12:40:18 -08:00
Kenny Root
2ec4af5920 am 138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
2011-01-26 09:25:43 -08:00
Kenny Root
138757db4f Merge "Make OBB results a one-way call" into gingerbread 2011-01-26 09:17:28 -08:00
Kenny Root
b7db2726e9 Make OBB results a one-way call
OBB result back to an application needs to be a one-way binder call.

Bug: 3353699
Change-Id: I0e625914d18a001c2fa9d764ea6463f34cf96743
2011-01-25 17:29:59 -08:00
Brad Fitzpatrick
6af61b8435 am a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit 'a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
  android.os.Message: respect sPoolSize
2011-01-25 15:44:33 -08:00
Brad Fitzpatrick
2405c278ef android.os.Message: respect sPoolSize
Also rename some static members from mFoo to sFoo.

Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
2011-01-25 14:54:31 -08:00
Jeff Hamilton
eb645a15b9 am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
  Use classnames instead of ints for NFC techs.
2011-01-25 14:41:55 -08:00
Jeff Hamilton
f126ad3b64 Merge "Use classnames instead of ints for NFC techs." into gingerbread 2011-01-25 14:35:46 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs.
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
2011-01-25 16:32:26 -06:00
Nick Pelly
3b61e47a3f am b134223f: Make Mifare Classic increment/decrement operands little endian
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
2011-01-25 08:41:35 -08:00
Nick Pelly
b134223f91 Make Mifare Classic increment/decrement operands little endian
Also make sure they are non-negative.

This is not documented in Mifare Classic spec, but based on findings from NXP:
- Operand should be stored in little-endian format in the transceive buffer
- Tag ignores the sign bit on the operand, its effectively 31-bit unsigned
- Overflow and underflow generates an error.

Change-Id: Id3389b3894ded732c4b00d564ca53f5df651359e
2011-01-25 07:45:07 -08:00
Justin Ho
7cd1cc8319 am 28c4f69a: Updated checkbox assets
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
  Updated checkbox assets
2011-01-24 13:08:54 -08:00
Justin Ho
28c4f69a93 Updated checkbox assets
Change-Id: I93c979816bc3310c510bf8942c273ce8c411150d
2011-01-24 13:05:06 -08:00
Arnaud Ferir
10ab8617e8 am 5e81a6e2: Fix trace mismatch.
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
2011-01-24 10:49:40 -08:00
Sylvain Fonteneau
e97a42e05c am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-24 10:49:36 -08:00
Arnaud Ferir
5e81a6e21e Fix trace mismatch.
Change-Id: Ie6e9a2baef63d2b5621593203742c2ffeaafc4ba
2011-01-24 12:15:21 -06:00
Sylvain Fonteneau
c5a418ecb7 Handle mock tags in android.nfc.Tag conversion to Parcel.
When generating a mock tag (after a NDEF exchange over LLCP), one of
the internal fields is set to null. This was causing NullPointerException
when being converted to a Parcel.

This is fixed by not including this field in the Parcel for mock tags.

Change-Id: I000e2faa54d71fd755ba7993e1e258743aad98fb
2011-01-24 12:15:13 -06:00
Nick Pelly
0065f398c1 am c896d85c: Merge "Add operands to mifare classic increment, decrement." into gingerbread
* commit 'c896d85c15d8a6c98c93df57d88481b89eb878f5':
  Add operands to mifare classic increment, decrement.
2011-01-23 22:14:54 -08:00
Nick Pelly
c896d85c15 Merge "Add operands to mifare classic increment, decrement." into gingerbread 2011-01-23 22:12:25 -08:00
Nick Pelly
1e233af3a7 Add operands to mifare classic increment, decrement.
Change-Id: Ib35f615142bda48a5e33888a09ebae2880624788
2011-01-23 22:11:44 -08:00
Nick Pelly
12619677b0 am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerbread
* commit 'da01b4abb817fcebdf33c27aaa6a1ac4a61beee0':
  Make MifareClassic methods more consistent.
2011-01-23 21:39:39 -08:00
Nick Pelly
da01b4abb8 Merge "Make MifareClassic methods more consistent." into gingerbread 2011-01-23 21:36:14 -08:00
Nick Pelly
e45083b11b Make MifareClassic methods more consistent.
Remove method overloading for combinations of sector+block addressing.
Instead provide methods that more closly match the raw commands, and more
efficient helpers to convert between blocks and sectors.

o fix off-by-one bug in getBlockCountInSector()
o add BLOCK_SIZE
o remove DESFIRE not operating in classic emulation (SAK 0x20)
o hide isEmulated(), there is no use case, and the info is available elsewhere
o getTotalBlockCount() -> getBlockCount()
o getBlockCount(int) -> getBlockCountInSector(int)
o introduce blockToSector() and sectorToBlock()
o remove authenticateBlock()
    make it really clear that authentication is per sector, and reduce function
    explosion. blockToSector() allows you to use authenticateSector...
o explicit authenticateSectorWithKeyA() / authenticateSectorWithKeyB()
    get rid of magic boolean
o remove all (int sector, int block) parameters
    always address by absolute block. this makes the API crystal clear, and
    helps reduce function explosion
o validation of all sector and block indices
o dont & 0xff when converting to byte - its redundant
o Remove TYPE_OTHER. Mifare Classic types are well-known and stable.

Change-Id: I3c9f8254ff307f31b388b3d7592c862d5de6afa5
2011-01-23 21:32:57 -08:00
Jeff Hamilton
535ec16c78 am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
  Allow null filters for foreground dispatch to act as catch all.
2011-01-23 19:28:17 -08:00
Jeff Hamilton
e1e70c5761 Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread 2011-01-23 19:17:22 -08:00
Jim Miller
1323ab83e4 am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-23 14:30:07 -08:00
Jim Miller
42a461570b Fix 3379239: Catch exceptions from workaround for OOM.
This catches possible exceptions caused by attempting to
unregister a receiver that may have already been unregistered.
This is related to the OOM issue workaround in Change I99a7e0c3.

Change-Id: Ib69a8acc6b12659125c958a03efac0a8a68a3859
2011-01-23 13:40:31 -08:00
Jeff Hamilton
9f20cd7ff2 Allow null filters for foreground dispatch to act as catch all.
Change-Id: Idf3d2e344a6e87035ccb5b533ed9e81fec596132
2011-01-23 12:15:28 -06:00
Jaikumar Ganesh
f643974954 am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
  Do Not Merge Connect other profiles when priority is auto connect.
2011-01-21 21:36:32 -08:00
Jaikumar Ganesh
1c9761e30d Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread 2011-01-21 21:25:01 -08:00