summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translations. DO NOT MERGEEric Fischer2011-11-1648-96/+0
| | | | Change-Id: I5f2eb5d7a5862bd8dfd2a3fc3b21f6c48138b8bf
* Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1Nick Pelly2011-11-142-9/+7
|\
| * Add null check to aovid NPE on un-matched close().Nick Pelly2011-11-142-9/+7
| | | | | | | | | | | | Also finish removing NFCEE permission, and fix a couple of style mistakes. Change-Id: I4ec22469990de6661365c281db2e8cfd7ae413b0
* | Merge "Implement static white-list access control for NFC-EE." into ics-mr1Nick Pelly2011-11-115-35/+393
|\ \ | |/
| * Implement static white-list access control for NFC-EE.Jeff Hamilton2011-11-115-35/+393
| | | | | | | | | | | | | | | | | | | | | | NFC service now has a build time array of package signatures and package names that are allowed access to the NFCEE, removing the shared certificate requirement. See sample_nfcee_access.xml for the XML format. Bug: 4515759 Change-Id: Ibf03e259137f2f4247ec5d31fb88b1090b013d32
* | Optimize soundpool use.Martijn Coenen2011-11-112-31/+58
|/ | | | | | | Share a single soundpool and release it when NFC is disabled. Bug: 5590478 Change-Id: I858c9520bf6880e7d7c5920c12966d86108dd125
* am 88194cf3: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-090-0/+0
|\ | | | | | | | | * commit '88194cf3293cd810f7f4dbf60889643f7c949237': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2011-11-082-2/+2
| | | | | | | | Change-Id: Ice3e77b3f49c0118bd631c398a395a3d499802b6
* | Reduce sound assets size.Eric Laurent2011-11-083-0/+0
| | | | | | | | | | | | | | | | | | | | The assets used for start end and error sounds were unecessarily large and caused a lot of memory to be used in media server process. Reduced the sound duration, sampling rate and converted to mono to devide the size by 8. Issue 5160674. Change-Id: Ifda28eae27e574867bc62e105dfef51685bf9f9a
* | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-072-2/+2
|\ \
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-072-2/+2
| | | | | | | | | | | | Change-Id: Ib28a165a6891dcdadd2720b7b4c2dc88e884428a
* | | Merge "Get EEPROM settings from NFC HAL." into ics-mr1Martijn Coenen2011-11-072-119/+30
|\ \ \
| * | | Get EEPROM settings from NFC HAL.Martijn Coenen2011-11-042-119/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed port configuration: libnfc retrieves it directly from the NFC HAL now. Change-Id: Ic57d20c3a8079aaaae3c129da189e8abf4e03dab
* | | | Merge "Remove static background image from Beam when no hw-acceleration." ↵Martijn Coenen2011-11-073-29/+1
|\ \ \ \ | |_|/ / |/| | | | | | | into ics-mr1
| * | | Remove static background image from Beam when no hw-acceleration.Martijn Coenen2011-11-033-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Beam scale down animation on is really jerky on devices where we can't use hardware acceleration. This seems to be due the fact that we have a static background over which we scale. Removing it makes the scaling nice and smooth. Bug: 5567020 Change-Id: Id04bae45713eaa368d03001e5352271f47d26603
* | | | 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
| |/ / | | | | | | | | | | | | This fixes the Beam animation on crespo. Change-Id: I1bc374dc532a4e83622c62b31ee5b4de2b5fa3ba
* | | Merge "Don't finish Beam animation again." into ics-mr1Martijn Coenen2011-11-042-2/+6
|\ \ \
| * | | Don't finish Beam animation again.Martijn Coenen2011-11-032-2/+6
| |/ / | | | | | | | | | | | | Bug: 5553836 Change-Id: I1bfd7e0aa3a1420decea7d793e851f44cb433cf2
* | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ | |/ / |/| | | | | Change-Id: I2abe972857665c08436dc694c10bc3e15d04583a
| * | Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-11-024-124/+10
| | | | | | | | | | | | | | | This reverts commit 79faaaec4f99360b1f9a3503b85433b6e77c7898, reversing changes made to fb21ff7547c2a8af66645bdc6be7daf7450e15af.
| * | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |\ \ | | |/ | |/|
* | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I485f902c558ad1c884a2fe36f9d4165a086dccf2
| * | Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-11-024-124/+10
| | | | | | | | | | | | | | | This reverts commit 79faaaec4f99360b1f9a3503b85433b6e77c7898, reversing changes made to fb21ff7547c2a8af66645bdc6be7daf7450e15af.
| * | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |\ \ | | |/ | |/|
| | * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-11-024-124/+10
| |/ | | | | | | | | This reverts commit 79faaaec4f99360b1f9a3503b85433b6e77c7898, reversing changes made to fb21ff7547c2a8af66645bdc6be7daf7450e15af.
* | Merge "Import revised translations." into ics-mr1Eric Fischer2011-11-012-0/+28
|\ \
| * | Import revised translations.Eric Fischer2011-11-012-0/+28
| | | | | | | | | | | | Change-Id: I143aebc8beea50841db9d6231b5fd0603c88875a
* | | am 08956967: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-010-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '08956967fb451d8c23f668610f860429661862a8': Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"
| * Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-010-0/+0
| |\ | | | | | | | | | Change-Id: I60c8f3c3da939a628bb430e6b1fb6925c00375b3
| | * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-10-314-124/+10
| |/ | | | | | | | | This reverts commit 79faaaec4f99360b1f9a3503b85433b6e77c7898, reversing changes made to fb21ff7547c2a8af66645bdc6be7daf7450e15af.
* | am ea499450: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ | |/ | | | | | | | | * commit 'ea4994501a05defd99ef3599c811959cfe30ef6c': Revert "Add event logs for NFC events. DO NOT MERGE" Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"
| * Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-10-310-0/+0
| |\ | | | | | | | | | Change-Id: I3739ea8271e7a88dd9e1f4584057c420c826ce5f
| | * Revert "Add event logs for NFC events. DO NOT MERGE"The Android Automerger2011-10-304-124/+10
| | | | | | | | | | | | This reverts commit a907d6f8c670ca07c0b09f3537fa6eecdc6d36b9.
| | * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-10-300-0/+0
| | |\ | |/ /
| | * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-10-284-124/+10
| |/ | | | | | | | | This reverts commit 79faaaec4f99360b1f9a3503b85433b6e77c7898, reversing changes made to fb21ff7547c2a8af66645bdc6be7daf7450e15af.
* | Add event logs for NFC events. DO NOT MERGEJeff Hamilton2011-10-284-10/+124
| | | | | | | | | | Bug: 5128799 Change-Id: I5607abe5d28ef9682afa084651c50aa651655b60
* | am 79faaaec: (-s ours) Merge "Add event logs for NFC events. DO NOT MERGE" ↵Jeff Hamilton2011-10-280-0/+0
|\ \ | |/ | | | | | | | | | | into ics-mr0 * commit '79faaaec4f99360b1f9a3503b85433b6e77c7898': Add event logs for NFC events. DO NOT MERGE
| * Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0Jeff Hamilton2011-10-284-10/+124
| |\
| | * Add event logs for NFC events. DO NOT MERGEJeff Hamilton2011-10-274-10/+124
| | | | | | | | | | | | | | | Bug: 5128799 Change-Id: I5607abe5d28ef9682afa084651c50aa651655b60
* | | am fb21ff75: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-270-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'fb21ff7547c2a8af66645bdc6be7daf7450e15af': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-271-1/+1
| |/ | | | | | | Change-Id: I40419521c179ba4eba7c40d818f5d8cbcf6063b5
* | Import revised translations. DO NOT MERGEEric Fischer2011-10-261-1/+1
| | | | | | | | Change-Id: If9c3a584cf13cd785cb989d42aa695535f55b725
* | am 628d629a: (-s ours) Merge "DO NOT MERGE. Set NFC EEPROM area to default ↵Nick Pelly2011-10-260-0/+0
|\ \ | |/ | | | | | | | | | | value for FW 109.7." into ics-mr0 * commit '628d629a4b39b84258369835c30d09c404c61c5e': DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7.
| * Merge "DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7." ↵Nick Pelly2011-10-261-1/+2
| |\ | | | | | | | | | into ics-mr0
| | * DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7.Martijn Coenen2011-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to switch from FW 109.11 (ICS-MR1) and FW 109.7 (ICS-MR0). This EEPROM location is used in ICS-MR1 for a new feature (Hybrid polling), but the value used in MR1 causes polling to be disabled in MR0. EEPROM values are stored on the NFC controller and will survive regular flashing. So the result is that if you switch from MR1 to MR0 then polling will fail. This fix is low risk, it just explicitly writes the value already stored in this EEPROM location. Bug: 5519093 Change-Id: I33d97134c68c03358f22b7773deea73c66166a98
* | | Merge "EEPROM values for NFC FW 109.11" into ics-mr1Nick Pelly2011-10-261-3/+8
|\ \ \
| * | | EEPROM values for NFC FW 109.11Martijn Coenen2011-10-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable hybrid polling with a ratio of 1 regular poll for every 4 low-power polls. Also, turn off the new EMD setting. Change-Id: I840d0538bf374fa1980bcfc4926d3d2e43a3ce4f
* | | | Merge "Write NFC EEPROM setting for lower-power poll measurements to ↵Martijn Coenen2011-10-261-43/+44
|\ \ \ \ | |/ / / | | | | | | | | default." into ics-mr1
| * | | Write NFC EEPROM setting for lower-power poll measurements to default.Martijn Coenen2011-10-251-43/+44
| | |/ | |/| | | | | | | Change-Id: I7eb676a75786584f0ed6757d8179cd457f3ef4ee
generated by cgit v1.1 at 2025-01-12 15:36:19 +0000