summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Refine setNfcSecure"HEADmasterGeorge Chang2021-10-122-20/+42
|\
| * Refine setNfcSecureGeorge Chang2021-10-122-20/+42
|/ | | | | | | | | Remove duplicate routing calculation. Fix crash issue when setNfcSecure was called at NFC off state. Bug: 199804867 Test: atest NfcNciInstrumentationTests Change-Id: Ic7f0c088afa95c9bac84a5836d51671e8853dd77
* Merge "Restore default route destination if possible"Treehugger Robot2021-10-081-0/+1
|\
| * Restore default route destination if possibleJack Yu2021-10-071-0/+1
| | | | | | | | | | | | | | | | | | Try to restore default route destination if route table size is not overflow. Bug: 202255679 Test: manaul Change-Id: I73b90c87a195cf1a690762a7c01029b999c4d81b
* | Merge "Merge Android 12"Xin Li2021-10-0714-39/+46
|\ \ | |/ |/|
| * Merge Android 12Xin Li2021-10-0614-39/+46
|/| | | | | | | | | | | Bug: 202323961 Merged-In: I23caf789c37d9f74a372aa754d21cceb3f4649ad Change-Id: If0575090720948ddecba4a1fb2aa8b10d5112da5
| * [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT ↵Bill Yi2021-09-090-0/+0
| |\ | |/ |/| | | | | | | | | | | | | | | MERGE" am: ab986d7417 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1822912 Change-Id: I23caf789c37d9f74a372aa754d21cceb3f4649ad
* | Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE"Bill Yi2021-09-091-0/+1
|\ \
| * \ Merge RQ3A.210905.001 to aosp-master - DO NOT MERGEBill Yi2021-09-081-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged-In: Ib319a8051140bf0e96e3c82fd5c300fd8054ddf8 Merged-In: I54b32b2e2cc89f685465a2b58f799260144edbbf Merged-In: I54b32b2e2cc89f685465a2b58f799260144edbbf Change-Id: I390121630298e104ec61e4620703cc348dd58c87
| | * \ Merge cherrypicks of [15164514, 15164515, 15164096, 15164078, 15163495, ↵android-11.0.0_r46android-11.0.0_r43android11-qpr3-releaseAndroid Build Coastguard Worker2021-06-301-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 15164068, 15164480, 15164097, 15164098, 15164482, 15164698, 15164375, 15164485, 15164469, 15164730, 15164731, 15164732, 15164733, 15164734, 15164735, 15164736, 15164737, 15164738, 15163662, 15164486, 15164519, 15164699, 15164700, 15164487, 15164099] into rvc-qpr3-release Change-Id: Ida1d712881b473a9b29da63ce0995eadd3f4d115
| | | * | Add HIDE_NON_SYSTEM_OVERLAY_WINDOWS permission to NfcAlisher Alikhodjaev2021-06-301-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This permission is required for xx_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS window flag to function properly. Bug: 180422108 Test: build ok Change-Id: I8246c06c0e7d60d4e06ef4fa430ccd5111e99a43 (cherry picked from commit 9c56b01c5745252c13c05a2fe39faaef130813e5)
| | | * Merge "Only send the message when the screen state change" am: 5673af7cb4Treehugger Robot2021-09-091-1/+3
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1821694 Change-Id: I163efdee963e21f3914426df9d75a177e554842b
* | | | Merge "Only send the message when the screen state change"Treehugger Robot2021-09-091-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Only send the message when the screen state changechloedai2021-09-091-1/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only send the MSG_APPLY_SCREEN_STATE message when the previous screen state is different to the current screen state to prevent from stuck in the pause polling. Bug: 191450167 Bug: 198110814 Test: Build pass Change-Id: I7ca304ba82d74ae90236a8610832d360d8468ad0
| | * Merge "Support multi users for NFC payments" am: d5720420b8Treehugger Robot2021-09-026-32/+148
| | |\ | |_|/ |/| | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1778385 Change-Id: Ib319a8051140bf0e96e3c82fd5c300fd8054ddf8
* | | Merge "Support multi users for NFC payments"android-s-beta-5android-s-beta-5Treehugger Robot2021-09-026-32/+148
|\ \ \
| * | | Support multi users for NFC paymentsJack Yu2021-09-026-32/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure nfc payment settings based on differernt users. Bug: 191851086 Bug: 191845397 Bug: 192994529 Test: nfc payment with 2nd user Change-Id: I2e772d671a6a9bb04480c9b4be7130099192c1ca
| | | * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-1416-49/+57
| | | |\ | | | | | | | | | | | | | | | | | | | | Merged-In: Ie6056cbe0a7be3226bf9834d5daf50773244b32c Change-Id: Ie5f06417f9a25ccca15542d224b4a6d35dc0fb9e
| | | | * Merge "Migrate usages of Bluetooth profile connect and disconnect methods to ↵Rahul Sabnis2021-08-031-5/+10
| | | | |\ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | setConnectionPolicy" am: 64a4c76336 am: 73e2ea56ee Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1784251 Change-Id: Ie6056cbe0a7be3226bf9834d5daf50773244b32c
| | | * | Merge "Migrate usages of Bluetooth profile connect and disconnect methods to ↵Rahul Sabnis2021-08-031-5/+10
| | | |\ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | setConnectionPolicy" am: 64a4c76336 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1784251 Change-Id: Ia01bae3ef5c9f61fb0de52467ee58beffc2bed35
* | | | | Merge "Migrate usages of Bluetooth profile connect and disconnect methods to ↵Rahul Sabnis2021-08-031-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | setConnectionPolicy"
| * | | | | Migrate usages of Bluetooth profile connect and disconnect methods toRahul Sabnis2021-08-021-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setConnectionPolicy Bug: 195150639 Test: Manual Change-Id: Ia7dc94faa6fc98f72b6c4e159b7e962ca0432094
| | | | | * Merge "Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'" am: 3019e1afa9 ↵Chloe Dai2021-08-021-1/+1
| | | | | |\ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a4933d9073 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1782515 Change-Id: Ic76b4f031b0702411d848481f4b4105f3cf889be
| | | | * | Merge "Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'" am: 3019e1afa9Chloe Dai2021-08-021-1/+1
| | | | |\ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1782515 Change-Id: Ic538ae5db6e737b8d3bbaeda82e1205d55b091a9
* | | | | | Merge "Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'"Chloe Dai2021-08-021-1/+1
|\ \ \ \ \ \
| * | | | | | Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'chloedai2021-07-301-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Definition: TYPE_SYSTEM_ALERT: In multiuser systems shows only on the owning user's window. TYPE_SYSTEM_DIALOG: In multiuser systems shows on all users' windows. Bug: 109824919 Test: Create several sub-users and test whether the web link confirmation dialog is able to show on the screen of each sub-user, Pass. Change-Id: Icd7656d8443ac9bf6e5036537617890781749cca
| | | | | * Merge "Fix popping up notification repeatedly issue" am: 6624c15372 am: ↵Treehugger Robot2021-07-301-1/+4
| | | | | |\ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69ab91be9e Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1781047 Change-Id: I574b99dddd7e23f6d03342d9436f316c16f6e1a0
| | | | * | Merge "Fix popping up notification repeatedly issue" am: 6624c15372Treehugger Robot2021-07-301-1/+4
| | | | |\ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1781047 Change-Id: If34c5c81448803c567bb9c60c128ec147152ede7
* | | | | | Merge "Fix popping up notification repeatedly issue"Treehugger Robot2021-07-301-1/+4
|\ \ \ \ \ \
| * | | | | | Fix popping up notification repeatedly issueMaoliang Tang2021-07-281-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the notification notified from settings for bluetooth pair is canceled by user, it will pop up repeatedly due to retry mechanism. Hence, peripheral handower need to be end directly but have a retry in this scenario. bug: 194878123 Signed-off-by: Maoliang Tang <tangmaoliang@xiaomi.com> Change-Id: Iceeed0aafa925978b5c64343697f5b6ce26f882b
| | | | | * Merge "Add TEST_MAPPING" am: 4aeaa0499b am: 4165113f22Treehugger Robot2021-07-301-0/+8
| | | | | |\ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1614499 Change-Id: I339db588d359ba98e761b96b4a143a61a4256dcb
| | | | * | Merge "Add TEST_MAPPING" am: 4aeaa0499bTreehugger Robot2021-07-301-0/+8
| | | | |\ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1614499 Change-Id: I37e0f4d29682433d9fba569dc7002ec276a26c48
* | | | | | Merge "Add TEST_MAPPING"Treehugger Robot2021-07-301-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add TEST_MAPPINGGeorge Chang2021-07-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 181561477 Test: atest --test-mapping system/nfc:postsubmit Change-Id: I3aa44691ee387ecc57c717f3feb92652c27eb20a
| | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-280-0/+0
| | | | | |\ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c811a34f2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/15412100 Change-Id: Id11e31d99a354224c3d05768005c98cd2d1fad52
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-282-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I50dbb90ac026ea7cecc9451f0a1a92ae96ea47ce
| | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-240-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99d51bcd53 -s ours am: c0ec5f0db1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/15378360 Change-Id: I4d9d1ed97ec44edfc5596560394694b63998593c
| | | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android12-devBill Yi2021-07-240-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99d51bcd53 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/15378360 Change-Id: I6c584a57166f4a84d4532a2f5708f2bf09464981
| | | | | | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ia1b545ddf5248a545af5236bd103b645eeeecd00
| | | | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-240-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7a98faf07 -s ours am: 21504113e1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/15380135 Change-Id: Id714b5ce86072cad1a580c9fe95a05a49ec257ac
| | | | | | * | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-240-0/+0
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7a98faf07 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/15380135 Change-Id: Ic854f80130ab775520fc72a2d5edf88598e607f3
| | | | | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I5d71ea3120180bf70defae020abcc749322c750d
| | | | | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-240-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5be3de2db -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/15378362 Change-Id: I016aa6d025f54a8d8c1458f6493e4aed46fe2e01
| | | | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Icc57a8984e617757e414e8ca9209b259702115cb
| | | | | * | | | Merge "Fix bluetooth peripheral handover issue" am: cb742da6cb am: 1764877a3bTreehugger Robot2021-07-211-6/+7
| | | | | |\ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1754210 Change-Id: Ib434da93a2e827274459262540fad265ae4942d4
| | | | * | | | | Merge "Fix bluetooth peripheral handover issue" am: cb742da6cbTreehugger Robot2021-07-211-6/+7
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1754210 Change-Id: I40d8a51ebe69f31d11e534348e98c2a5249f2cf5
* | | | | | | | | Merge "Fix bluetooth peripheral handover issue"Treehugger Robot2021-07-211-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bluetooth peripheral handover issueMaoliang Tang2021-07-081-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tryPeripheralHandover won't work when do it in device setup stage until nfc process reboot next time. Just need to reset the internal state in PeripheralHandoverService to resolve this problem. bug: 193115971 Test: passed under manual test Signed-off-by: Maoliang Tang <tangmaoliang@xiaomi.com> Change-Id: I6a60d6c3ecbc84486c0ce7d1ed0d46912738b318
| | | | | | * | | | Merge "Unset reader mode when nfc is turned off" am: 1706779148 am: b140ecf12aTreehugger Robot2021-07-192-0/+5
| | | | | | |\ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1766029 Change-Id: I7008f835c7dfa719148296fffe0d08c75b4c85ee
| | | | | * | | | | Merge "Unset reader mode when nfc is turned off" am: 1706779148Treehugger Robot2021-07-192-0/+5
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1766029 Change-Id: I9558e18e62104642ba08a99b77c09b5368878e88
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-04 10:54:01 +0000