Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
vendor
/
nxp
/
opensource
/
packages
/
apps
/
Nfc
/
9bfa3a38eaac1eff19660b6b7d7a6865296e21bd
9bfa3a3
Import revised translations.
by Eric Fischer
· 13 years ago
86987aa
Merge "Always search for p2p target in discovery list."
by Martijn Coenen
· 13 years ago
53b56cb
Always search for p2p target in discovery list.
by Martijn Coenen
· 13 years ago
fd2cdbf
Nfc: s/NFC JNI/NFCJNI/ in jni log tag.
by mike wakerly
· 13 years ago
c9342fe
NfcService: some trivial cleanups.
by mike wakerly
· 13 years ago
47791cf
LOG -> ALOG
by Nick Pelly
· 13 years ago
b5a1f0f
am 7948ab63: Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
7948ab6
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
3957268
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
63a5c36
am 985dcef8: Fix Beam&Tag failures after opening NFC-EE.
by Nick Pelly
· 13 years ago
985dcef
Fix Beam&Tag failures after opening NFC-EE.
by Nick Pelly
· 13 years ago
e64c652
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
3a8843a
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
4df60d8
am 16ac4580: (-s ours) Import revised translations. DO NOT MERGE
by Eric Fischer
· 13 years ago
16ac458
Import revised translations. DO NOT MERGE
by Eric Fischer
· 13 years ago
eafd2ed
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
3f3cc18
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
a76d8ec
resolved conflicts for merge of 92250f5c to master
by Nick Pelly
· 13 years ago
92250f5
Fix mismatched link()/unlink() causing NFC-EE to be stuck open.
by Nick Pelly
· 13 years ago
ebbf54b
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
e95ef63
am 951dad2b: Restore deleted string still referenced from manifest.
by Eric Fischer
· 13 years ago
25e0d39
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
951dad2
Restore deleted string still referenced from manifest.
by Eric Fischer
· 13 years ago
1fc599b
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
b2c4b38
Merge "Import revised translations."
by Eric Fischer
· 13 years ago
e2cccc0
Import revised translations.
by Eric Fischer
· 13 years ago
2a3f6f1
Fix two incorrect synchronized statements.
by mike wakerly
· 13 years ago
a29693d
am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1
by Martijn Coenen
· 13 years ago
3a67510
Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1
by Martijn Coenen
· 13 years ago
5eadae2
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
841409b
Fix NdefFormatable not showing up for NfcA technologies.
by Martijn Coenen
· 13 years ago
b65d7ea
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
ad62867
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
772130a
am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
by Nick Pelly
· 13 years ago
e1cadb0
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
by Nick Pelly
· 13 years ago
37bb7b2
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
by Nick Pelly
· 13 years ago
ac9b34c
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
c171c42
am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ics-mr1
by Martijn Coenen
· 13 years ago
61b4532
am 078e8368: Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1
by Nick Pelly
· 13 years ago
806a782
Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ics-mr1
by Martijn Coenen
· 13 years ago
483f306
Also send NFCEE broadcasts to dynamically registered receivers.
by Martijn Coenen
· 13 years ago
078e836
Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1
by Nick Pelly
· 13 years ago
23136ec
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
fba7c35
am bc6535cc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
by Eric Fischer
· 13 years ago
602f9b6
am 59137f77: No-op merge from ics-mr0
by The Android Open Source Project
· 13 years ago
4d80c35
Set up DISCOVERY and SE notification callbacks at NFC init.
by Nick Pelly
· 13 years ago
bc6535c
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
by Eric Fischer
· 13 years ago
e6178c2
Import revised translations. DO NOT MERGE
by Eric Fischer
· 13 years ago
59137f7
No-op merge from ics-mr0
by The Android Open Source Project
· 13 years ago
5c12d70
Reconcile with ics-factoryrom-2-release
by The Android Open Source Project
· 13 years ago
2a7163a
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
b5ca7e7
am 2b093e93: Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1
by Nick Pelly
· 13 years ago
2b093e9
Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1
by Nick Pelly
· 13 years ago
fc87b42
Enable NFC-EE immediately when screen is on but locked.
by mike wakerly
· 13 years ago
574f278
am f4226b69: Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1
by Nick Pelly
· 13 years ago
905cf88
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
f4226b6
Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1
by Nick Pelly
· 13 years ago
0571ce5
Add null check to aovid NPE on un-matched close().
by Nick Pelly
· 13 years ago
68dfe2c
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
0d00a83
resolved conflicts for merge of ebf4b36e to master
by Nick Pelly
· 13 years ago
1d9c95c
am d9203771: Optimize soundpool use.
by Martijn Coenen
· 13 years ago
ebf4b36
Merge "Implement static white-list access control for NFC-EE." into ics-mr1
by Nick Pelly
· 13 years ago
d920377
Optimize soundpool use.
by Martijn Coenen
· 13 years ago
b0928ea
Allow EEPROM settings override using properties.
by Martijn Coenen
· 13 years ago
c05387e
Implement static white-list access control for NFC-EE.
by Jeff Hamilton
· 13 years ago
07cb451
Merge "Import revised translations."
by Eric Fischer
· 13 years ago
0c14e3f
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
4d4713b
Import revised translations.
by Eric Fischer
· 13 years ago
a0e2279
am 133d5fee: (-s ours) am 88194cf3: (-s ours) Import revised translations. DO NOT MERGE
by Eric Fischer
· 13 years ago
1027822
am c1c09483: Reduce sound assets size.
by Eric Laurent
· 13 years ago
133d5fe
am 88194cf3: (-s ours) Import revised translations. DO NOT MERGE
by Eric Fischer
· 13 years ago
6d470b8
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
88194cf
Import revised translations. DO NOT MERGE
by Eric Fischer
· 13 years ago
c1c0948
Reduce sound assets size.
by Eric Laurent
· 13 years ago
81d5e01
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
9408fa0
am d7bca9eb: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
by Eric Fischer
· 13 years ago
d7bca9e
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
by Eric Fischer
· 13 years ago
086971d
Import revised translations. DO NOT MERGE
by Eric Fischer
· 13 years ago
b28f540
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
de189bb
am cbc85676: Merge "Get EEPROM settings from NFC HAL." into ics-mr1
by Martijn Coenen
· 13 years ago
c9a17f6
am f7a151e2: Merge "Remove static background image from Beam when no hw-acceleration." into ics-mr1
by Martijn Coenen
· 13 years ago
cbc8567
Merge "Get EEPROM settings from NFC HAL." into ics-mr1
by Martijn Coenen
· 13 years ago
f7a151e
Merge "Remove static background image from Beam when no hw-acceleration." into ics-mr1
by Martijn Coenen
· 13 years ago
7ba4a8a
merge in ics-mr1-release history after reset to ics-mr1
by The Android Automerger
· 13 years ago
5c5ecd9
am a2181682: Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1
by Martijn Coenen
· 13 years ago
9390cc0
am 304a7304: Merge "Don\'t finish Beam animation again." into ics-mr1
by Martijn Coenen
· 13 years ago
a218168
Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1
by Martijn Coenen
· 13 years ago
304a730
Merge "Don't finish Beam animation again." into ics-mr1
by Martijn Coenen
· 13 years ago
c7f74df
Get EEPROM settings from NFC HAL.
by Martijn Coenen
· 13 years ago
967f455
Reconcile with ics-mr1-release
by The Android Open Source Project
· 13 years ago
f2ce6fd
am 8896c444: Reconcile with ics-factoryrom-2-release
by The Android Open Source Project
· 13 years ago
8896c44
Reconcile with ics-factoryrom-2-release
by The Android Open Source Project
· 13 years ago
d59b331
Remove static background image from Beam when no hw-acceleration.
by Martijn Coenen
· 13 years ago
e3cfbec
Check for navigation bar when cropping Beam screenshot.
by Martijn Coenen
· 13 years ago
4e0ab31
Don't finish Beam animation again.
by Martijn Coenen
· 13 years ago
fe84878
Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"
by The Android Automerger
· 13 years ago
9fee282
merge in ics-factoryrom-2-release history after reset to ics-mr0
by The Android Automerger
· 13 years ago
6619596
am b8e9f010: Reconcile with ics-factoryrom-2-release
by The Android Open Source Project
· 13 years ago
b8e9f01
Reconcile with ics-factoryrom-2-release
by The Android Open Source Project
· 13 years ago
bc02dfe
am 2d97436c: Merge "Import revised translations." into ics-mr1
by Eric Fischer
· 13 years ago
Next »