summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* resolved conflicts for merge of 92250f5c to masterNick Pelly2011-12-011-14/+25
|\
| * Fix mismatched link()/unlink() causing NFC-EE to be stuck open.Nick Pelly2011-12-011-14/+25
* | Fix two incorrect synchronized statements.mike wakerly2011-11-281-2/+2
* | am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA technologies."...Martijn Coenen2011-11-281-11/+23
|\ \ | |/
| * Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1Martijn Coenen2011-11-281-11/+23
| |\
| | * Fix NdefFormatable not showing up for NfcA technologies.Martijn Coenen2011-11-281-11/+23
* | | am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.ap...Nick Pelly2011-11-213-5/+0
|\ \ \ | |/ /
| * | Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1Nick Pelly2011-11-213-5/+0
| |\ \ | | |/ | |/|
| | * Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-213-5/+0
* | | am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered rece...Martijn Coenen2011-11-171-9/+6
|\ \ \ | |/ /
| * | Also send NFCEE broadcasts to dynamically registered receivers.Martijn Coenen2011-11-171-9/+6
| |/
* | am 2b093e93: Merge "Enable NFC-EE immediately when screen is on but locked." ...Nick Pelly2011-11-151-92/+143
|\ \ | |/
| * Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1Nick Pelly2011-11-151-92/+143
| |\
| | * Enable NFC-EE immediately when screen is on but locked.mike wakerly2011-11-151-92/+143
* | | am f4226b69: Merge "Add null check to aovid NPE on un-matched close()." into ...Nick Pelly2011-11-151-3/+7
|\ \ \ | |/ /
| * | Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1Nick Pelly2011-11-141-3/+7
| |\ \ | | |/
| | * Add null check to aovid NPE on un-matched close().Nick Pelly2011-11-141-3/+7
* | | resolved conflicts for merge of ebf4b36e to masterNick Pelly2011-11-112-27/+347
|\ \ \ | |/ /
| * | Merge "Implement static white-list access control for NFC-EE." into ics-mr1Nick Pelly2011-11-112-27/+347
| |\ \ | | |/
| | * Implement static white-list access control for NFC-EE.Jeff Hamilton2011-11-112-27/+347
* | | am d9203771: Optimize soundpool use.Martijn Coenen2011-11-112-31/+58
|\ \ \ | |/ /
| * | Optimize soundpool use.Martijn Coenen2011-11-112-31/+58
| |/
* | am f7a151e2: Merge "Remove static background image from Beam when no hw-accel...Martijn Coenen2011-11-071-21/+0
|\ \ | |/
| * Merge "Remove static background image from Beam when no hw-acceleration." int...Martijn Coenen2011-11-071-21/+0
| |\
| | * Remove static background image from Beam when no hw-acceleration.Martijn Coenen2011-11-031-21/+0
* | | am a2181682: Merge "Check for navigation bar when cropping Beam screenshot." ...Martijn Coenen2011-11-051-4/+7
|\ \ \ | |/ /
| * | Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1Martijn Coenen2011-11-041-4/+7
| |\ \ | | |/
| | * Check for navigation bar when cropping Beam screenshot.Martijn Coenen2011-11-031-4/+7
* | | am 304a7304: Merge "Don\'t finish Beam animation again." into ics-mr1Martijn Coenen2011-11-052-2/+6
|\ \ \ | |/ /
| * | Don't finish Beam animation again.Martijn Coenen2011-11-032-2/+6
| |/
| * Add event logs for NFC events. DO NOT MERGEJeff Hamilton2011-10-283-9/+105
* | Changes semantics of isNdefPushEnabled() - require NFC to be enabled.Nick Pelly2011-10-311-1/+1
* | Add event logs for NFC events.Jeff Hamilton2011-10-253-9/+105
|/
* Merge "NFC: Enable guard host timeout." into ics-mr0Martijn Coenen2011-10-213-0/+9
|\
| * NFC: Enable guard host timeout.Martijn Coenen2011-10-213-0/+9
* | Merge "Start all NFC activities from a dedicated root task." into ics-mr0Martijn Coenen2011-10-212-37/+76
|\ \ | |/ |/|
| * Start all NFC activities from a dedicated root task.Martijn Coenen2011-10-172-37/+76
* | Fix crash when turning screen off and NFC is off.Martijn Coenen2011-10-191-6/+4
* | Make the crash on screen off less frequent.Jeff Hamilton2011-10-171-16/+35
* | Final NFC animation tweaks.Martijn Coenen2011-10-141-2/+15
|/
* NFC: Remove statusbar/navbar from animated screenshot.Martijn Coenen2011-10-112-23/+39
* Merge "NFC screenshot animation adjustments: - eliminate discontinuous jump w...Brandon Keely2011-10-101-25/+44
|\
| * NFC screenshot animation adjustments:Brandon Keely2011-10-071-25/+44
* | Updated FireflyRenderThread to be more subtle and depthy.Brandon Keely2011-10-071-55/+34
|/
* Add DUMP permissions checkKenny Root2011-09-301-0/+9
* NfcService: call enableAppSwitches for additional events.mike wakerly2011-09-282-7/+16
* Fix NFC to only be enabled when the lockscreen is dismissed.Jeff Hamilton2011-09-261-1/+1
* Show NFC call-to-action text immediately.Nick Pelly2011-09-212-63/+6
* Fix fireflies on prime.Martijn Coenen2011-09-221-2/+4
* Remove first-share notification.Martijn Coenen2011-09-151-36/+0