summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Dejank Android Beam animation."Martijn Coenen2012-03-284-486/+582
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Dejank Android Beam animation.Martijn Coenen2012-03-284-486/+582
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After profiling, it turns out the Beam animation was mostly janky because of the initial buffer allocations that take place in the graphics driver. Modified both the animation and firefly renderers to swap the buffers three times before drawing anything, thereby making sure the buffers are allocated. Do not scale the screenshot while rendering fireflies, as that can cause jank as well. Also modified the FireflyRenderer to keep most of its state alive between subsequent Beams, causing it to come up faster. Cleaned up some old code and added documentation. Change-Id: Ica231861dd7ede178ad2ec1ab09aa00d1c876624
* | | | Update URL from Market to Play. Add feature parameter.Nick Pelly2012-03-211-2/+2
|/ / / | | | | | | | | | Change-Id: Ie8d0f65f7055e8bdca1e2f3b322a5b9a280ea2d2
* | | Merge "Perform default Beam behavior from system apps."Nick Pelly2012-03-061-11/+4
|\ \ \
| * | | Perform default Beam behavior from system apps.Nick Pelly2012-03-061-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Launch the app if its installed on the other device. 2) Lanch market with a search for the app if it is not installed. Bug: 6091238 Change-Id: Ifc593f1f2ad120ef1b3b2e90ac157f99c0df5b16
* | | | Merge "Change threading/locking model of BluetoothHeadsetHandover"Nick Pelly2012-03-061-40/+40
|\ \ \ \ | |/ / /
| * | | Change threading/locking model of BluetoothHeadsetHandoverNick Pelly2012-03-021-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | All work is now done on the main thread. No locks needed. Change-Id: I59f8d925e2465c697b6f3521c9fa6204b52d6802
* | | | Merge "Implement NFC-BT handover for Bluetooth headsets, such as Nokia BH-505."Nick Pelly2012-03-023-0/+576
|\ \ \ \ | |/ / /
| * | | Implement NFC-BT handover for Bluetooth headsets, such as Nokia BH-505.Nick Pelly2012-03-023-0/+576
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Touch once to turn BT on, pair, connect HFP and A2DP, and start the music. Touch again to disconnect HFP and A2DP. Change-Id: Icfe120606aae5e80b04cc4aba3b03331a1213676 TODO: enable Bluetooth without causing auto-connection to *other* devices TOOD: disable Bluetooth when disconnecting if it was enabled for this device TODO: il8n / UI review TODO: check security issues around auto-on BT and auto-pair
* | | Support for setting p2p modes from javaland and some cleanup.Martijn Coenen2012-03-023-0/+28
|/ / | | | | | | | | | | Removed code-duplication, fixed some warnings. Change-Id: I5b7a2986e3836d6689b677bf80cb93421bfa821e
* | Fix crash when disabling NFC with target in field.Martijn Coenen2012-02-271-2/+8
| | | | | | | | Change-Id: I6c8d85278bc1379d40d83ec4d3df5797e4643e10
* | Cache installed packages for sending SE broadcasts.Martijn Coenen2012-02-131-21/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the list of installed packages takes some time on a phone with lots of packages (seen >500ms). Since we did this for every SE broadcast (including field on / field off), I've seen the NFC service event queue fill up, which has a bad effect on latency-critical events such as the events for llcp link establishment. This caches the list of installed packages. Bug: 5963061 Change-Id: Ia9f02c9ce58dae5c81949f7317425e5ee415ee92
* | Use the new "appliance" ui mode configuration to determine whether to show ↵Joe Onorato2012-02-111-1/+10
| | | | | | | | | | | | nfc confirmation ui. Change-Id: I7ad5d6ad684c6079b9d48ef28b9d77edf8abdf0c
* | Allow apps to selectively disable beamIsaac Levy2012-02-091-8/+9
| | | | | | | | | | | | | | | | | | if apps register a callback but return 'null', do not create the default message. Fixes b/5943350 Change-Id: I247bb7d508c15777904599c3a211c30e81351f15
* | Merge "LLCP 1.1 support."Martijn Coenen2012-01-274-11/+14
|\ \
| * | LLCP 1.1 support.Martijn Coenen2012-01-274-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow servicename for connectionless sockets; - Pass in servicename in Bind() for both types; - EchoServer: allow MIU=128 again since ATR_RES fix was merged in libnfc-nxp - EchoServer: fix reading from incorrect offset. Change-Id: Ie77fe5b46e7a17435e6261c8b7400dcca4d3784a
* | | Don't need to pass the NdefMessage in dispatch().Nick Pelly2012-01-262-8/+14
| | | | | | | | | | | | Change-Id: Ib1463aa51b1ce48cf7217866cb7c11ab8caa4e06
* | | Merge "LLCP echo server implementation."Martijn Coenen2012-01-262-0/+431
|\ \ \ | |/ /
| * | LLCP echo server implementation.Martijn Coenen2012-01-202-0/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be used to test the Android LLCP stack with nfcpy. Disabled by default. Also fixed unnecessary JNI release call causing warnings in the logs. Change-Id: Iaed159e23dadc1601be2df2aadbe1d9c54c50615
* | | Rewrite NDEF dispatch path. It was getting pretty messy.Nick Pelly2012-01-254-289/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dispatch sequence is identical, but the hierarchy of functions has been collapsed. The flow now is: dipsatchTag() -> tryOverrides() -> *** NDEF override *** *** TECH override *** *** TAG override *** tryNdef() -> *** AAR to NDEF *** *** AAR to application launch *** *** AAR to market launch *** *** regular NDEF *** tryTech() -> *** TECH *** *** TAG *** o Fix bug where cancelling a pending intent would disable further foreground dispatch. o Fix bug where a foreground process dying would not cancel override o Assume one NdefMessage per tag in implementation methods Change-Id: Iaf7a0a83076e4f540a5e55c9e628490570116b01
* | | Merge "Bring LLCP connectionless sockets back to life."Martijn Coenen2012-01-185-2/+119
|\ \ \ | |/ /
| * | Bring LLCP connectionless sockets back to life.Martijn Coenen2012-01-135-2/+119
| | | | | | | | | | | | | | | | | | Useful for testing the connectionless part of the LLCP stack. Change-Id: I76a7962526ec1e6ff463c938431229f89c545824
* | | Make airplane override for NFC persistent.Martijn Coenen2012-01-101-4/+14
|/ / | | | | | | | | | | | | Make behavior identical to wifi/bluetooth. Bug: 5455123 Change-Id: I8c10888b7d3129723c6520dc0e81fa1793ae542c
* | NfcService: some trivial cleanups.mike wakerly2011-12-129-25/+16
| | | | | | | | | | | | | | | | | | | | | | | | I noticed these while looking at something else. - Removes unused imports; unthrown exceptions on some non-visible methods; dead code. - Tags a few stray interface implementations that lacked @Override. - Removes unnecessary semicolons in a few place. - Fixes one instance of ArrayList being used as a raw type. Change-Id: I860921a3a4d003fd6d6fc1381c0813599f3caf26
* | resolved conflicts for merge of 92250f5c to masterNick Pelly2011-12-011-14/+25
|\ \ | |/ | | | | Change-Id: Ibad338d19e8b8c54ce02a0e347d1965dcf7b7008
| * Fix mismatched link()/unlink() causing NFC-EE to be stuck open.Nick Pelly2011-12-011-14/+25
| | | | | | | | | | | | | | | | | | | | The fix is to keep a strong reference to the IBinder (actually a BinderProxy) from the caller while the NFC-EE is open. The bug occurs when a GC occurs in NfcService while the NFC-EE is open. The BinderProxy is destroyed before it has been unlinked. Bug: 5684874
* | Fix two incorrect synchronized statements.mike wakerly2011-11-281-2/+2
| | | | | | | | | | | | | | (credit: robtsai) Change-Id: Ic628bd0c156cd88e0f18db46212c8ebdf4eaedf5 Bug: 5631907
* | am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA ↵Martijn Coenen2011-11-281-11/+23
|\ \ | |/ | | | | | | | | | | technologies." into ics-mr1 * commit '3a6751007b70265fc69019f59f308246cad76157': Fix NdefFormatable not showing up for NfcA technologies.
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from a patch applied long ago: the NfcA technology used to have its higher-level type (Mifare / 4A) associated with it, and the code that determined formatable used this. The patch associated NfcA technology only with the 3A libnfc type, causing the format check to return false for all of these types. Change-Id: Idc02873de447b6d8121bff02af795a6a7f5058cf
* | | am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic ↵Nick Pelly2011-11-213-5/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Nfc.apk" into ics-mr1 * commit 'e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d': Replace vendor specific NfcGoogle.apk with generic Nfc.apk
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The access control changes allow us to just use Nfc.apk with the regular platform certificate, instead of the custom signed NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle and just build it out of packages/apps/Nfc now. The package name is also reverted from com.android.nfc3 to com.android.nfc The NFC uid needs to get bumped (25 to 27) to allow the cert change. Bug: 5608249 Change-Id: I4437dff96f2529f0b9e7d8e65c21359c3eeccd0b
* | | am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered ↵Martijn Coenen2011-11-171-9/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | receivers." into ics-mr1 * commit '806a78272a812f274309bd902b319590a254a896': Also send NFCEE broadcasts to dynamically registered receivers.
| * | Also send NFCEE broadcasts to dynamically registered receivers.Martijn Coenen2011-11-171-9/+6
| |/ | | | | | | | | Bug: 5630129 Change-Id: I050283b6a8be0f564b34da0f8c08c6bb708f2501
* | am 2b093e93: Merge "Enable NFC-EE immediately when screen is on but locked." ↵Nick Pelly2011-11-151-92/+143
|\ \ | |/ | | | | | | | | | | into ics-mr1 * commit '2b093e93f56f008413665e876a6189921a4a57b3': Enable NFC-EE immediately when screen is on but locked.
| * 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
| | | | | | | | | | | | | | | Bug: 5375005 Change-Id: I072dfbca1fa8cdd25cf9232f2f0c82080aec767b
* | | am f4226b69: Merge "Add null check to aovid NPE on un-matched close()." into ↵Nick Pelly2011-11-151-3/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr1 * commit 'f4226b69c9e19d0329069b39d8ae2774fcbf88d1': Add null check to aovid NPE on un-matched close().
| * | 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
| | | | | | | | | | | | | | | | | | Also finish removing NFCEE permission, and fix a couple of style mistakes. Change-Id: I4ec22469990de6661365c281db2e8cfd7ae413b0
* | | resolved conflicts for merge of ebf4b36e to masterNick Pelly2011-11-112-27/+347
|\ \ \ | |/ / | | | | | | Change-Id: I73a3025a35da21db6600b6e82c99836641e9bee7
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am d9203771: Optimize soundpool use.Martijn Coenen2011-11-112-31/+58
|\ \ \ | |/ / | | | | | | | | | * commit 'd92037714c289cffb9ed1e6e6df36cd3b7292a21': Optimize soundpool use.
| * | 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 f7a151e2: Merge "Remove static background image from Beam when no ↵Martijn Coenen2011-11-071-21/+0
|\ \ | |/ | | | | | | | | | | hw-acceleration." into ics-mr1 * commit 'f7a151e2fe02af5026d6aad37447f13bff60c56a': Remove static background image from Beam when no hw-acceleration.
| * Merge "Remove static background image from Beam when no hw-acceleration." ↵Martijn Coenen2011-11-071-21/+0
| |\ | | | | | | | | | into ics-mr1
| | * Remove static background image from Beam when no hw-acceleration.Martijn Coenen2011-11-031-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am a2181682: Merge "Check for navigation bar when cropping Beam screenshot." ↵Martijn Coenen2011-11-051-4/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr1 * commit 'a21816821f6e1ff024cf93662150f8819bc5e3c9': Check for navigation bar when cropping Beam screenshot.