summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 363a666a: am c336a8c4: Merge "Reset P2P flag in de-initialization." into ↵Martijn Coenen2015-07-291-0/+1
|\ | | | | | | | | | | | | mnc-dr-dev * commit '363a666afd3175904d5bc8b4e73d2751ca7af176': Reset P2P flag in de-initialization.
| * am c336a8c4: Merge "Reset P2P flag in de-initialization." into mnc-dr-devMartijn Coenen2015-07-291-0/+1
| |\ | | | | | | | | | | | | * commit 'c336a8c4fc880909475be1870fb9281f1dd00ab0': Reset P2P flag in de-initialization.
| | * Merge "Reset P2P flag in de-initialization." into mnc-dr-devMartijn Coenen2015-07-291-0/+1
| | |\
| | | * Reset P2P flag in de-initialization.Jizhou Liao2015-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The sP2PEnalbed flag should be set to false in de-initialization. Change-Id: I480d3664d004c068e8043e999da6da442a4095a0
* | | | am d02b61c3: am d1618c0a: am 0fdfe750: Use a foreground priority broadcast ↵Nicolas Prevot2015-07-241-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | to hand over data to bluetooth. * commit 'd02b61c3e222f196bf149adb7497687bfc262088': Use a foreground priority broadcast to hand over data to bluetooth.
| * | | am d1618c0a: am 0fdfe750: Use a foreground priority broadcast to hand over ↵Nicolas Prevot2015-07-241-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | data to bluetooth. * commit 'd1618c0a362027f74a388ab6d1f2efccda9d7c7d': Use a foreground priority broadcast to hand over data to bluetooth.
| | * | am 0fdfe750: Use a foreground priority broadcast to hand over data to bluetooth.Nicolas Prevot2015-07-221-0/+1
| | |\ \ | | | |/ | | |/| | | | | | | | | * commit '0fdfe750521cc21197e56f3908f5205e21c63302': Use a foreground priority broadcast to hand over data to bluetooth.
| | | * Use a foreground priority broadcast to hand over data to bluetooth.Nicolas Prevot2015-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't, it may take a very long time for the broadcast to be received. Change-Id: I343830d568c1b83fbc0308260ec4f7dc00bbf0f2
* | | | am 1283f4b0: (-s ours) am e3263602: (-s ours) am b7a8d179: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '1283f4b0445af2cc5527656bf43c57ff38e7bddf': Import translations. DO NOT MERGE
| * | | am e3263602: (-s ours) am b7a8d179: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'e3263602298adefa6f6b6acad0a458279bc8a3f2': Import translations. DO NOT MERGE
| | * | am b7a8d179: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'b7a8d179fc58999d8c56a97365474f0a9f3ffcc2': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-07-154-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I8e2bc7452e1f73e46d7888040b66339bd912279b Auto-generated-cl: translation import
* | | | am 3da480ef: (-s ours) am 3c476dbc: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '3da480ef335287e7d2a269d2cfe08f772c6643d1': Import translations. DO NOT MERGE
| * | | am 3c476dbc: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | |/ | |/| | | | | | | * commit '3c476dbc9fdc15750d128b18044e5138c603421b': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-07-114-7/+7
| |/ | | | | | | | | Change-Id: I91ef041586b22bd3f28bb4cd069caf9891151603 Auto-generated-cl: translation import
* | am a7f7ebfa: In BeamShareActivity, don\'t use UserHandle.CURRENT.Nicolas Prevot2015-07-021-4/+5
|\| | | | | | | | | * commit 'a7f7ebfa3c8e585cbedea6fc4ffa8aec973ee607': In BeamShareActivity, don't use UserHandle.CURRENT.
| * In BeamShareActivity, don't use UserHandle.CURRENT.Nicolas Prevot2015-07-011-4/+5
| | | | | | | | | | | | | | | | | | In the work profile, UserHandle.CURRENT refers to the primary user. We want to refer to the work profile itself. So, using new UserHandle(UserHandle.myUserId()) instead. BUG:21960385 Change-Id: I2b29b4d862daae58f666024e9f538cea1dbe39a3
* | am a772e9a8: New permission in Nfc stack to allow client validation.Rubin Xu2015-06-221-0/+1
|\| | | | | | | | | * commit 'a772e9a83cf5a1f321c909a9b8aed2a226decae0': New permission in Nfc stack to allow client validation.
| * New permission in Nfc stack to allow client validation.Rubin Xu2015-06-191-0/+1
| | | | | | | | | | | | | | | | This is to allow clients to enforce that a NFC message is dispatched to them from the Nfc stack, rather than from some arbitrary apps. Bug: 19838376 Change-Id: Ifbc0379b8aecd330bbd2519c4de4dfc22e1a3247
* | am 5697d208: Disable NFC if policy disallow in foreground NDEF caseAlex Chau2015-06-161-2/+6
|\| | | | | | | | | * commit '5697d20844cf52e71aa9125ac1fbfc9436bd8ed5': Disable NFC if policy disallow in foreground NDEF case
| * Disable NFC if policy disallow in foreground NDEF caseAlex Chau2015-06-151-2/+6
| | | | | | | | | | | | | | | | - Before this fix, NFC is only disabled in "default NDEF" cases, if NDEF callback is in foreground, it will continue to send the beam without checking for policy. Bug: 21742271 Change-Id: I19dd83160623bcfcc3e7cb2b0ffb5c4329e92d17
* | am b14b4057: Add LOCAL_MAC_ADDRESS permission.Martijn Coenen2015-06-041-0/+1
|\| | | | | | | | | * commit 'b14b4057a9b5b9d88e7fca0dc972fe7d363f35bf': Add LOCAL_MAC_ADDRESS permission.
| * Add LOCAL_MAC_ADDRESS permission.Martijn Coenen2015-06-041-0/+1
| | | | | | | | | | | | | | For Android Beam. Bug: 20545952 Change-Id: Icaf7119b3c4e3209a99c6505ff58d3e2c92fe16d
* | am 40cc9895: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
|\| | | | | | | | | * commit '40cc9895872247da998cfba28b9a80bc0a29f068': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEGeoff Mendal2015-05-302-7/+50
|/ | | | | Change-Id: Ie930c5fbca0815a32f761129dd61df26c90bd78b Auto-generated-cl: translation import
* NFC: Move playSound to BeamManager (DO NOT MERGE).Atsushi Suga2015-05-193-39/+23
| | | | | | | | | | | | Beam Receive Service or Beam Send Service process is being killed immediately while playing the success sound which resulted to sound being cut. Move the Beam success sound from Beam Receive Service and Beam Send Service process to Beam Manager process using the Nfc Service sound pool. Change-Id: I6f9f99c6cc16649983eed36adf652c790f3bcbb7
* Always play sound on send resume.Martijn Coenen2015-05-111-2/+2
| | | | | Bug: 20823481 Change-Id: I050e517f7aca1b4db403af997a151bcfd7ead360
* Why is NFC using PhoneWindow directly...?Adam Powell2015-05-061-1/+1
| | | | | | Fix build after private framework class moved. Change-Id: Ide52977db3ba2f507ce4d055d77d7563a76a0763
* Fix NfcService crash when handover busySatoshi Fujita2015-04-281-1/+1
| | | | | | | When handover is busy state, onHandoverBusy() is called recursively and NfcService crashes. Change-Id: I8d4f291ab11713859dd3aa70ddde5439c94c17de
* Beam / LLCP improvements.Martijn Coenen2015-04-283-129/+29
| | | | | | | | | | | | | | | | | | | | | | | | | - Don't show Beam UI unless the other device runs a SNEP server. We didn't do this previously because an old stack issue could delay the SNEP connect by as much as 750ms, therefore also delaying the UI. We expect there to be very few of those devices in use at this point (if any). This also paves the way for preventing Beam UI to be shown when connecting to future Android devices (those devices could shut down SNEP in specific scenarios). - Immediately try to connect LLCP (SNEP, handover) services. We didn't do this previously because the old stack had race conditions, which could be triggered by immediately sending a LLCP connect. Again, very few of those devices are expected to be in use at this point. Making this change will generally decrease the latency of a P2P transaction, especially in scenarios where the send was previously authorized (ie from the share menu). - Fixed a bug in SendUi where it wouldn't store the screenshot in a specific case. We're only hitting this now because of the two changes I mentioned above. - A bit of clean-up (though this class could use a lot more...) Change-Id: I52f5ff314dc06e5502bdf869ee658078c3a44fde
* Import translations. DO NOT MERGEGeoff Mendal2015-04-226-0/+225
| | | | | Change-Id: I37da659a157a36650743d822bc01a1d5ccb8c099 Auto-generated-cl: translation import
* am ea9ba101: am e8b5bb64: Merge "Fix peripheral handover issues"Martijn Coenen2015-04-202-8/+31
|\ | | | | | | | | * commit 'ea9ba101f0f1f77810f1d21b38575c6093de12d1': Fix peripheral handover issues
| * am e8b5bb64: Merge "Fix peripheral handover issues"Martijn Coenen2015-04-202-8/+31
| |\ | | | | | | | | | | | | * commit 'e8b5bb64f5c83838055776f0c9a70536473cbb97': Fix peripheral handover issues
| | * Merge "Fix peripheral handover issues"Martijn Coenen2015-04-202-8/+31
| | |\
| | | * Fix peripheral handover issuesBalachandar Swami2015-04-152-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Add synchronization to PeripheralHandoverService so multiple starts are stopped correctly 2) Dismiss Confirm Connect dialog properly if user ignores it (accidently navigates to home screen etc) Change-Id: I2329f46dd9a94b907ddd43323c5f3d7fba3670b8
* | | | am 46c6f9cf: am b6b45036: Merge "Expose peer LLCP version to apps."Martijn Coenen2015-04-176-6/+24
|\| | | | | | | | | | | | | | | | | | | * commit '46c6f9cf5ef0b881006da34c73b4622cff148abd': Expose peer LLCP version to apps.
| * | | am b6b45036: Merge "Expose peer LLCP version to apps."Martijn Coenen2015-04-176-6/+24
| |\| | | | | | | | | | | | | | | | | | * commit 'b6b45036607b0d40ef4071183ca6a21d38a05783': Expose peer LLCP version to apps.
| | * | Merge "Expose peer LLCP version to apps."Martijn Coenen2015-04-176-6/+24
| | |\ \
| | | * | Expose peer LLCP version to apps.Martijn Coenen2015-04-156-6/+24
| | | |/ | | | | | | | | | | | | Change-Id: Id5ea699a8508b5bdf44c0bae2d38893e2c42241a
* | | | am ea6c6c91: am e1214dab: Merge "Clear NFC task on launch."Martijn Coenen2015-04-154-4/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'ea6c6c91450a21dae7a454c0496331a7282efa3b': Clear NFC task on launch.
| * | | am e1214dab: Merge "Clear NFC task on launch."Martijn Coenen2015-04-154-4/+4
| |\| | | | | | | | | | | | | | | | | | * commit 'e1214dabfdec63081ac684e297a377ea24912141': Clear NFC task on launch.
| | * | Merge "Clear NFC task on launch."Martijn Coenen2015-04-154-4/+4
| | |\ \
| | | * | Clear NFC task on launch.Martijn Coenen2015-04-154-4/+4
| | | |/ | | | | | | | | | | | | Change-Id: Iba7d37df00d657c4f8e53d8034f2822ab593ee4e
* | | | am 6b901740: am 3651f412: Merge "Don\'t allow overlapping AID registrations."Martijn Coenen2015-04-152-2/+19
|\| | | | | | | | | | | | | | | | | | | * commit '6b901740f58ecd6ff10f002adee7edeeec30b5aa': Don't allow overlapping AID registrations.
| * | | am 3651f412: Merge "Don\'t allow overlapping AID registrations."Martijn Coenen2015-04-152-2/+19
| |\| | | | | | | | | | | | | | | | | | * commit '3651f412cfdfc5e2f14575a926ac5d030bcfd324': Don't allow overlapping AID registrations.
| | * | Merge "Don't allow overlapping AID registrations."Martijn Coenen2015-04-152-2/+19
| | |\ \ | | | |/ | | |/|
| | | * Don't allow overlapping AID registrations.Martijn Coenen2015-04-152-2/+19
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | If a service registers a prefix *and* and an exact AID which falls in the prefix range, the latter is not ignored as it should be. Bug: 19144664 Change-Id: Iac0b4e2a7b606483b4d6ae07c9b82045caee84a9
* | | am cd4baf78: am 09aed954: Merge "Add missing @Override"Martijn Coenen2015-04-141-0/+1
|\| | | | | | | | | | | | | | * commit 'cd4baf784604d8dafcf8555756f622d71431db51': Add missing @Override
| * | am 09aed954: Merge "Add missing @Override"Martijn Coenen2015-04-141-0/+1
| |\| | | | | | | | | | | | | * commit '09aed95455cd61d2e9ff055203a420f93061bf6f': Add missing @Override
| | * Merge "Add missing @Override"Martijn Coenen2015-04-141-0/+1
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 12:24:33 +0000