summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-30Snap for 6801596 from e5026e9d980932cb4063e82e84951dac196d2f5b to ↵android-11.0.0_r16android11-d1-b-releaseandroid-build-team Robot
rvc-d1-b-release Change-Id: Id5a4e9183340763537bf111b1d792fd86ae5df21
2020-08-29Merge "Ensure pending intent on beam notification is immutable" into oc-dev ↵TreeHugger Robot
am: a45b7e4a6f am: 6977d45586 am: 19c33afaa6 am: b7e5ab8782 am: 81897e1c5a am: 5077c06bff am: 9876984114 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265009 Change-Id: I122422039b943ace28411fda492ed33be839b3db
2020-08-29Merge "Ensure pending intent on beam notification is immutable" into oc-dev ↵TreeHugger Robot
am: a45b7e4a6f am: 6977d45586 am: 19c33afaa6 am: b7e5ab8782 am: 81897e1c5a am: 5077c06bff Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265009 Change-Id: I08a6b31ff9268aab0a80f914eab3272d5bd5ff2f
2020-08-29Merge "Ensure pending intent on beam notification is immutable" into oc-dev ↵TreeHugger Robot
am: a45b7e4a6f am: 6977d45586 am: 19c33afaa6 am: b7e5ab8782 am: 81897e1c5a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265009 Change-Id: I9a15f2eedee7429a2d4a31a09e6131ae6a03ffa2
2020-08-29Merge "Ensure pending intent on beam notification is immutable" into oc-dev ↵TreeHugger Robot
am: a45b7e4a6f am: 6977d45586 am: 19c33afaa6 am: b7e5ab8782 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265009 Change-Id: I454b6da7ceef5f4d167a5ec46daa27f7bb37a3e9
2020-08-29Merge "Ensure pending intent on beam notification is immutable" into oc-dev ↵TreeHugger Robot
am: a45b7e4a6f am: 6977d45586 am: 19c33afaa6 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265009 Change-Id: I8b21aadfd00ca41e160e620801ff6728828d5f8a
2020-08-29Merge "Ensure pending intent on beam notification is immutable" into oc-dev ↵TreeHugger Robot
am: a45b7e4a6f am: 6977d45586 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265009 Change-Id: I6eccc6edec2a29a71b371080143c5ae6fd492568
2020-08-29Merge "Ensure pending intent on beam notification is immutable" into oc-dev ↵TreeHugger Robot
am: a45b7e4a6f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265009 Change-Id: I53581e7380c1c6f241e42b0a509b46c338b32fe1
2020-08-29Merge "Ensure pending intent on beam notification is immutable" into oc-devTreeHugger Robot
2020-08-20Snap for 6779986 from 0a95a8a7155f8df430369423de49913ce914dbbe to ↵android-build-team Robot
rvc-d1-b-release Change-Id: I9185306251116a1d2fe4bf2e8c4e37b5a47942e5
2020-08-20Snap for 6749551 from 2e73a69cd55552c24f4a7c78fca9535c21aad0e4 to ↵android-build-team Robot
rvc-d1-b-release Change-Id: I1553dbd60bcd3a256cf71f54774ea793f68452ab
2020-08-10Snap for 6751715 from 0a95a8a7155f8df430369423de49913ce914dbbe to ↵android-build-team Robot
rvc-d1-b-release Change-Id: Ic0da53ebe8150a015585e600271019cca05c5fe5
2020-08-10Merge "Make read error toast configurable" into rvc-d1-devGeorge Chang
2020-08-06Make read error toast configurableGeorge Chang
Sometimes nfc read error toast would reset screen timeout, because NFC would detect the same tag every few seconds when unknown_tag_polling_delay enabled. Set read error toast default disable, since read error toast conflicts with unknown_tag_polling_delay. Test: manual Bug: 159865156 Change-Id: I0ce6e53ba2dcb8a7780437ec8e9d21fb303e09ce
2020-08-04Snap for 6736220 from 2e73a69cd55552c24f4a7c78fca9535c21aad0e4 to ↵android-build-team Robot
rvc-d1-b-release Change-Id: If87ec6c14aa500826916470f85361bfdd1873374
2020-08-04[automerger skipped] Protect Bluetooth device information when using NFC ↵George Chang
pairing am: 5700c012b2 am: 5781f75dab am: 10f17f32f9 am: 8a48c89cc0 am: 70dffef6ba am: ee78f34192 -s ours am: 248c0072eb -s ours am skip reason: Change-Id I22528d6574a5d5db584aab7eb648b5e083598895 with SHA-1 fa31fa1bfd is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265012 Change-Id: I8ee3ee006c5f7b8ee1ef4dde842158c3f1bf7b21
2020-08-04[automerger skipped] Protect Bluetooth device information when using NFC ↵George Chang
pairing am: 5700c012b2 am: 5781f75dab am: 10f17f32f9 am: 8a48c89cc0 am: 70dffef6ba am: ee78f34192 -s ours am skip reason: Change-Id I22528d6574a5d5db584aab7eb648b5e083598895 with SHA-1 fa31fa1bfd is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265012 Change-Id: I14410d85852280ee446f0e640a135ecc24612b7c
2020-08-04Protect Bluetooth device information when using NFC pairing am: 5700c012b2 ↵George Chang
am: 5781f75dab am: 10f17f32f9 am: 8a48c89cc0 am: 70dffef6ba Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265012 Change-Id: I56c586b1568a94b940dbc8bf8a2fd0105ec05391
2020-08-04Protect Bluetooth device information when using NFC pairing am: 5700c012b2 ↵George Chang
am: 5781f75dab am: 10f17f32f9 am: 8a48c89cc0 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265012 Change-Id: I5ed1264f77a87ec094d6e9bf7fc9204042c636d6
2020-08-04Protect Bluetooth device information when using NFC pairing am: 5700c012b2 ↵George Chang
am: 5781f75dab am: 10f17f32f9 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265012 Change-Id: I9c08251c2519138d9b7f5c00d3021e209c635a0f
2020-08-04Protect Bluetooth device information when using NFC pairing am: 5700c012b2 ↵George Chang
am: 5781f75dab Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265012 Change-Id: Ie45d900462d1349ebd40e46fe8c431be1d433a2b
2020-08-04Protect Bluetooth device information when using NFC pairing am: 5700c012b2George Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265012 Change-Id: I3e9b0368e4adf7c4dc79b2f65e0d55a36dcf7a83
2020-08-03Snap for 6732510 from 493aa0c60a476b5d1c3f201fe41b7815bb7c4673 to ↵android-build-team Robot
rvc-d1-b-release Change-Id: If88d28dd75cc014497c607506409d4153ca94078
2020-08-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I90855986a55ec5a42c4a7df9aab8eec09a554707
2020-07-30Protect Bluetooth device information when using NFC pairingGeorge Chang
Bug: 140417248 Test: Manual test Merged-In: I22528d6574a5d5db584aab7eb648b5e083598895 Change-Id: Ia9ac9013da05450753c32537d6c2ac26cb930724
2020-07-30Ensure pending intent on beam notification is immutableGeorge Chang
Bug: 159060474 Test: manual Change-Id: I90b5212651eb88b06db266a4e6a23b8baefaf47e
2020-07-08Keep screen on only when dispatch succeed am: 83d3c739f6George Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12086434 Change-Id: I67eb2a048240804e544827bcf7adee5d3e23393e
2020-07-07Keep screen on only when dispatch succeedandroid11-devGeorge Chang
Bug: 159865156 Bug: 65353992 Test: Manual (Read NFC tag and check screen state) Change-Id: Ib3d79cd6cc88bafb729808a2cfc8d8a24a726f44
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3d0155c825 -s ↵Bill Yi
ours am: c8b94bf319 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12089052 Change-Id: Ia5e9303fd0927dfd1636fd91af90e757a9655022
2020-07-07[automerger skipped] Import translations. DO NOT MERGE am: 3d0155c825 -s oursBill Yi
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12089052 Change-Id: I84941d3b3983a54e57078c3b39da75bbe5be0f5e
2020-07-06Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I010c5030bf6192295e818752e606ca96c2d8e824
2020-07-05Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I636e4da23bae54cbcf8a611899334a5559e4c240
2020-06-28[automerger skipped] Import translations. DO NOT MERGE am: ab2041d601 -s oursBill Yi
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12026800 Change-Id: I108887f508e97e0ad43d5909bc46dd9a46e9c39e
2020-06-28Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ie018a5545a9708b19412954a6c73119afdab516d
2020-06-19[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev ↵TreeHugger Robot
am: 40b9508f2f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/11928261 Change-Id: I8afead0dad067ef309a7232e808dd46f6af3a908
2020-06-19Merge "Import translations. DO NOT MERGE" into rvc-devTreeHugger Robot
2020-06-19Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Id87c5f85f16fd27c87546da6ea2c69ac40f29292
2020-06-19Merge "Remove the NFC_DEP count from NumDiscNtf" into rvc-dev am: 73469c9d62George Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/11822728 Change-Id: I8623ec684fc5cccb8c7cc6cc815977125e8f7c50
2020-06-19Merge "Remove the NFC_DEP count from NumDiscNtf" into rvc-devGeorge Chang
2020-06-18Remove the NFC_DEP count from NumDiscNtfGeorge Chang
Remove the NFC_DEP count, because NFC_DEP protocol would be skipped in selectFirstTag and selectNextTagIfExists Bug: 158641173 Test: Read old Andorid devices with P2P(NFC_DEP) capability Change-Id: Idf341c00e1e6aaa4ae6ba44cbf3d1d14cc1e1ec6
2020-06-17Merge "Import translations. DO NOT MERGE" into rvc-d1-devTreeHugger Robot
2020-06-17Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: If7496109d5fefd2388496cd749d1da81575076b4
2020-06-17Refine setReaderMode API behavior am: 7f3967fde8Jack Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/11790989 Change-Id: I5813087f488ba164df3bdc38983050a3bb5d23bc
2020-06-17Refine setReaderMode API behaviorJack Yu
Based on the new requested use scenario, this API need to be refine to handle multiple caller and keeps listen mode enabled. Bug: 157173627 Test: Call setReaderMode works Change-Id: Iafb395f291e53ea1991236afcb285d30ec0a69a7
2020-06-16Refine NfcBlockedNotification am: 2edd8c10b4George Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/11867586 Change-Id: I81767f36eab8889874cae99bfbc7840a07de343e
2020-06-16Refine NfcBlockedNotificationGeorge Chang
Transparent activity is on the top keeps stealing touch events thus the user has no idea why tapping on the screen does nothing. Fix it by posting the notification directly, without starting a new Activity. Bug: 158792678 Test: start a notification manually Change-Id: I470b4c8fd5c3b6e54cd07d1c26480f82a95cc478
2020-06-15[automerger skipped] Import translations. DO NOT MERGE am: 5f47026802 -s oursBill Yi
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/11859842 Change-Id: Ibed9b91fba43bccec1e172fb77d4e2a0047c898a
2020-06-14Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ieb1739cd93ce9a58fd06840884b7ec236964a38c
2020-06-04Merge "Improve isInForeground" into rvc-dev am: 2cbe03023eGeorge Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/11631648 Change-Id: I2a0e6a47e5ebc97d79f3990a55f556e122e3b0f1
2020-06-04Merge "Improve isInForeground" into rvc-devGeorge Chang
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 14:01:57 +0000