Commits · 6817861dcc9c88366b56fafe0500e27abfcaafda · halo / packages_apps_Nfc

24 May, 2011 2 commits
- Re-enable nfc. · 6817861d
  Jason parks authored 14 years ago
  
  6817861d
- Fix bad merge from gingerbread: · f28e772d
  Jeff Hamilton authored 14 years ago
```
Show an icon in the status bar when the NfcAdapter is in card emulation mode.

Change-Id: I64805f1b5f9d4bd9784791ed3a67d76b9e3788f3
```
  f28e772d
20 May, 2011 1 commit
- Reconcile with gingerbread-release · 8df39c66
  The Android Open Source Project authored 14 years ago
```
Change-Id: I13ff32b3260efec3a3a5de479453bc02840c2921
```
  8df39c66
13 May, 2011 2 commits
- merge in gingerbread-release history after reset to gingerbread · 9cd18bbd
  The Android Automerger authored 14 years ago
  
  9cd18bbd
- am df118e14: am 6344b654: Add Rev · d6d10bcb
  mike wakerly authored 14 years ago
```
* commit 'df118e14':
  Add Rev
```
  d6d10bcb
12 May, 2011 2 commits
- am 6344b654: Add Rev · df118e14
  mike wakerly authored 14 years ago
```
* commit '6344b654':
  Add Rev
```
  df118e14
- Add Rev · 6344b654
  mike wakerly authored 14 years ago
```
Change-Id: Ide8d8dfe75eebb93420bc7a95130b0f6a72756b6
```
  6344b654
29 Apr, 2011 4 commits
- am 1a934b77: am 543b1768: Merge "Better logging on SE open failure." into gingerbread · 27096d4d
  Jeff Hamilton authored 14 years ago
```
* commit '1a934b77':
  Better logging on SE open failure.
```
  27096d4d
- am 60312045: am a8d8c1fa: Avoid reference table overflows when dealing with secure elements. · 9cc1c355
  Jeff Hamilton authored 14 years ago
```
* commit '60312045':
  Avoid reference table overflows when dealing with secure elements.
```
  9cc1c355
- am 543b1768: Merge "Better logging on SE open failure." into gingerbread · 1a934b77
  Jeff Hamilton authored 14 years ago
```
* commit '543b1768':
  Better logging on SE open failure.
```
  1a934b77
- am a8d8c1fa: Avoid reference table overflows when dealing with secure elements. · 60312045
  Jeff Hamilton authored 14 years ago
```
* commit 'a8d8c1fa':
  Avoid reference table overflows when dealing with secure elements.
```
  60312045
28 Apr, 2011 1 commit
- Merge "Better logging on SE open failure." into gingerbread · 543b1768
  Jeff Hamilton authored 14 years ago
  
  543b1768
27 Apr, 2011 2 commits
- am 15758e60: am 7a7f8f8f: Only execute the teardown APDUs when a package is being fully removed. · 7248d3ba
  Jeff Hamilton authored 14 years ago
```
* commit '15758e60':
  Only execute the teardown APDUs when a package is being fully removed.
```
  7248d3ba
- am 7a7f8f8f: Only execute the teardown APDUs when a package is being fully removed. · 15758e60
  Jeff Hamilton authored 14 years ago
```
* commit '7a7f8f8f':
  Only execute the teardown APDUs when a package is being fully removed.
```
  15758e60
20 Apr, 2011 3 commits

Better logging on SE open failure. · 275376f9

Jeff Hamilton authored 14 years ago

If the secure element connection fails to open
due to an external RF field being detected it's
now logged to make debugging easier.

Bug: 4304698
Change-Id: Iea6e23968ee18d4f99e7ecbbf1b60b7c1688f5b6

275376f9

Avoid reference table overflows when dealing with secure elements. · a8d8c1fa
Jeff Hamilton authored 14 years ago
```
Bug: 4258601
Change-Id: Ib21892b6efa8e23ea86566ed6f88c2e9d284fa89
```
a8d8c1fa
Only execute the teardown APDUs when a package is being fully removed. · 7a7f8f8f
Jeff Hamilton authored 14 years ago
```
Bug: 4316508
Change-Id: I498eb09cfb48b3b14268c649936186000f360c16
```
7a7f8f8f

11 Apr, 2011 6 commits
- am c9b1fce8: am 588b7334: Merge "NFC JNI: log detected AID as a single message." into gingerbread · 79e3ebc0
  mike wakerly authored 14 years ago
```
* commit 'c9b1fce8':
  NFC JNI: log detected AID as a single message.
```
  79e3ebc0
- am 686ea371: am 5e7b58d9: Don\'t crash when an unregistered package is removed. · eff655e3
  Jeff Hamilton authored 14 years ago
```
* commit '686ea371':
  Don't crash when an unregistered package is removed.
```
  eff655e3
- am 588b7334: Merge "NFC JNI: log detected AID as a single message." into gingerbread · c9b1fce8
  mike wakerly authored 14 years ago
```
* commit '588b7334':
  NFC JNI: log detected AID as a single message.
```
  c9b1fce8
- am 5e7b58d9: Don\'t crash when an unregistered package is removed. · 686ea371
  Jeff Hamilton authored 14 years ago
```
* commit '5e7b58d9':
  Don't crash when an unregistered package is removed.
```
  686ea371
- am 3ea1c986: Merge commit \'613fcd91\' into manualmerge · 7b52524a
  Jason parks authored 14 years ago
```
* commit '3ea1c986':
  Implement tear down scripts.
```
  7b52524a
- Merge commit '613fcd91' into manualmerge · 3ea1c986
  Jason parks authored 14 years ago
```
Conflicts:
	src/com/android/nfc/NfcService.java

Change-Id: I554e33d89fda1f74fd976263a8c4dc0549303eda
```
  3ea1c986
08 Apr, 2011 2 commits
- am ad3d60fa: am 8afd14d3: Make the NFC UID forward compatible. · 0bd9aec2
  Jeff Hamilton authored 14 years ago
```
* commit 'ad3d60fa':
  Make the NFC UID forward compatible.
```
  0bd9aec2
- am 8afd14d3: Make the NFC UID forward compatible. · ad3d60fa
  Jeff Hamilton authored 14 years ago
```
* commit '8afd14d3':
  Make the NFC UID forward compatible.
```
  ad3d60fa
06 Apr, 2011 1 commit
- Don't crash when an unregistered package is removed. · 8f339bda
  Jeff Hamilton authored 14 years ago
```
Bug: 4205311
Change-Id: I116e7c2e12c7e160d81154d22589b1bdefe93e44
```
  8f339bda
05 Apr, 2011 2 commits
- am 9d6ad355: am 37179222: Merge "Increase wired mode timeout to 10 seconds." into gingerbread · cdc759e2
  Nick Pelly authored 14 years ago
```
* commit '9d6ad355':
  Increase wired mode timeout to 10 seconds.
```
  cdc759e2
- am 37179222: Merge "Increase wired mode timeout to 10 seconds." into gingerbread · 9d6ad355
  Nick Pelly authored 14 years ago
```
* commit '37179222':
  Increase wired mode timeout to 10 seconds.
```
  9d6ad355
04 Apr, 2011 2 commits
- Merge "NFC JNI: log detected AID as a single message." into gingerbread · 588b7334
  mike wakerly authored 14 years ago
  
  588b7334
- Don't crash when an unregistered package is removed. · 5e7b58d9
  Jeff Hamilton authored 14 years ago
```
Bug: 4205311
Change-Id: I116e7c2e12c7e160d81154d22589b1bdefe93e44
```
  5e7b58d9
01 Apr, 2011 4 commits
- merge in gingerbread-release history after reset to gingerbread · c5a0f164
  The Android Automerger authored 14 years ago
  
  c5a0f164
- Merge "Implement tear down scripts." into gingerbread · 613fcd91
  Jason parks authored 14 years ago
  
  613fcd91
- Implement tear down scripts. · bcd6a995
  Jason parks authored 14 years ago
```
Change-Id: Ie6d491b4bf1a735d4119f78f252aa14a95536149
```
  bcd6a995
- Make the NFC UID forward compatible. · 8afd14d3
  Jeff Hamilton authored 14 years ago
```
Change-Id: Idebe263500839a0238fd5b0cf732e5ecc477698e
```
  8afd14d3
31 Mar, 2011 1 commit
- merge in gingerbread-release history after reset to gingerbread · 61785b08
  The Android Automerger authored 14 years ago
  
  61785b08
30 Mar, 2011 5 commits
- am 1124dc4b: am 93d8a69c: Add com.android.nfc.permission.NFCEE_ADMIN. · c48d7934
  Jeff Hamilton authored 14 years ago
```
* commit '1124dc4b':
  Add com.android.nfc.permission.NFCEE_ADMIN.
```
  c48d7934
- am 6c4df906: am cd46a585: Change the package name to allow using a new cert. · f64fbc21
  Jeff Hamilton authored 14 years ago
```
* commit '6c4df906':
  Change the package name to allow using a new cert.
```
  f64fbc21
- am 93d8a69c: Add com.android.nfc.permission.NFCEE_ADMIN. · 1124dc4b
  Jeff Hamilton authored 14 years ago
```
* commit '93d8a69c':
  Add com.android.nfc.permission.NFCEE_ADMIN.
```
  1124dc4b
- Merge "Increase wired mode timeout to 10 seconds." into gingerbread · 37179222
  Nick Pelly authored 14 years ago
  
  37179222
- Increase wired mode timeout to 10 seconds. · ba640175
  Nick Pelly authored 14 years ago
```
Change-Id: I496a74f2fbad55cb8f04a434a386d6d86e7d3636
```
  ba640175