summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-21Snap for 8857176 from f22366ab7a6729a85f028c76dc140625767a56da to ↵aml_go_tz4_330912000android13-mainline-go-tzdata4-releaseAndroid Build Coastguard Worker
mainline-go-tzdata4-release Change-Id: I57bf6699869fc3712187d3e1fe8562496ef1c2aa
2022-07-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-07-16[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-dev am: 79e1b9fb5a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19291122 Change-Id: I69548d92a03fabe21e5a71964d4a46987e354c91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-16[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a4d5d71daa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19291122 Change-Id: I23f1b7e42c503cab0c63796dcad87fa83b8d3590 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-07-15[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 5e5239e8db am: 9c48e5325a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19286925 Change-Id: Ibf7ef42b1d390df91e1921dd6818288992cc6822 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5e5239e8dbBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19286925 Change-Id: I0118c963726798eca00b7710b8d2bdbc0c745493
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1e9258433bf815301cb7bd710a2fd1edad9c95c8
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I23573e2d461a31cee3c4b27c21dd2420c46e8817
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2509ffca0ed2628c455db1a5a263685ac38eb95b
2022-07-11Snap for 8817865 from e9a4001044382bd2826b88609a1c7740dc05ef16 to ↵Android Build Coastguard Worker
mainline-go-tzdata4-release Change-Id: Ieb690d2ea53b31ecce72dcb5b3fd0b8bfd85792e
2022-07-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e23c0e7a3 -s ours am: 2c7c66d8d4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19134958 Change-Id: I86c4db9a45d15c8879b978baa106d878db6b4404 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e23c0e7a3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19134958 Change-Id: I53fcb6bfc2fbc99c866995c9afac268489e5a753 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-dev am: b68de99e59 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19134961 Change-Id: I746d7fe910528aa414666ff2259c9d3df999b36c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d31cdfa8cb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19134961 Change-Id: I1d74f7c05ca54c6d7c43d72d077efe889e74c0c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-06-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f2d6f2d9ee -s ours am: ce53f5e576 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19134719 Change-Id: Ie171a935821a3bdbc881c9ed7068b7869c998cba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f2d6f2d9ee -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19134719 Change-Id: I130202564072181a2f9d05b9a439407f3c6cb29e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I097b6846c0f4e93e341f998600e21f64515ede60
2022-06-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I86376e7450b0624a0e592f3d902dee17f01531a3
2022-06-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0ff7ccdc6fa3944bc4f59002f85be25dd5140d81
2022-06-22Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: 347b5e6612Oriol Prieto Gascó
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18981850 Change-Id: I38019e5d91f2815ef62804b910e0a96bc8b83e03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22Merge "Use com.android.bluetooth as the BT stack APK" into tm-devandroid13-devOriol Prieto Gascó
2022-06-21Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-06-21[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ace8831dae -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/19012830 Change-Id: I6b83f99e2fdfe51a8e6ce16d27e5886a7e7888ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0456d663aafab197472efe1e428c6a26c9dcea56
2022-06-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6e1e2948d7346f1f0cbfb3ac2e2563f77b54a0c8
2022-06-19Use com.android.bluetooth as the BT stack APKOriol Prieto Gasco
Test: TH Bug: 236187653, 236192423 Change-Id: I24b5318f35e8d9f3284729d096745b3b5b27bc2b
2022-06-16Snap for 8736029 from 362989b32427fb397498eed09342d409d482ac74 to ↵Android Build Coastguard Worker
mainline-go-tzdata4-release Change-Id: Ibbb94f77547cd9ae85ee6b778a8dd54755feab22
2022-05-21Snap for 8626064 from 0d11a7d023d73e73631905185e2a0ca138f2793a to ↵Android Build Coastguard Worker
mainline-go-tzdata4-release Change-Id: I0644cd1078875030dde49a10592b27adf248db7b
2022-05-12Merge "Handle shutdown for right user" into tm-dev am: 0d11a7d023TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18178968 Change-Id: Idf6c7d0da05c54ed16161e5299e453074b1fe2d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Merge "Change vibration type to USAGE_HARDWARE_FEEDBACK" into tm-dev am: ↵TreeHugger Robot
6accbd850b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18154292 Change-Id: I2d3b2757e4014ed81fe99c43f820b853fa2f1cc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Merge changes I3371d1b3,I0b2526c5 into tm-dev am: f5f7b7db5dGeorge Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18282083 Change-Id: I338bad2f4f24b901658bb925f56cbe4f9819461d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Refine MSG_DELAY_POLLING enqueue condition am: f371742957George Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18154300 Change-Id: I6c7f3f9a0234139764ddcc09ced88a7aa204b533 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11Merge "Handle shutdown for right user" into tm-devTreeHugger Robot
2022-05-11Merge "Change vibration type to USAGE_HARDWARE_FEEDBACK" into tm-devTreeHugger Robot
2022-05-11Merge changes I3371d1b3,I0b2526c5 into tm-devGeorge Chang
* changes: Refine delay polling control flow Refine MSG_DELAY_POLLING enqueue condition
2022-05-10Bluetooth pairing with NFC failed am: 7c7c8ca90bAlisher Alikhodjaev
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18282084 Change-Id: I9d3b18450378ad7d085b485ea319ad0f848be01c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Bluetooth pairing with NFC failedAlisher Alikhodjaev
Use BluetoothDevice.disconnect() instead of BluetoothProfile.CONNECTION_POLICY_FORBIDDEN Bug: 219398443 Test: pair/unpair via NFC Merged-In: I7155c1028770b49ca2e141bace2d91c4e41d4bfd Change-Id: I7155c1028770b49ca2e141bace2d91c4e41d4bfd
2022-05-10Refine delay polling control flowGeorge Chang
Bug: 231411134 Test: manual Merged-In: I3371d1b321b0cc37f7deaabbc743cdf456bd2b23 Change-Id: I3371d1b321b0cc37f7deaabbc743cdf456bd2b23
2022-05-10Change vibration type to USAGE_HARDWARE_FEEDBACKJack Yu
When device detects a NFC tag, there will be a vibration notification no matter "Touch feedback" is disabled or not. Bug: 229657794 Test: manual Change-Id: Ie63dc505d6438e0a4ae383bdab009e3e015868ff
2022-05-09Handle shutdown for right userJack Yu
Only process a shutdown when it is for all users (whole system), not a single user. Bug: 228134218 Test: manual Change-Id: Idc8c918b890da11aac03ca093deddaaadab4f6ac Merged-In: Idc8c918b890da11aac03ca093deddaaadab4f6ac
2022-05-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
8b3cfcf163 -s ours am: cf8cc115cd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18091363 Change-Id: I7087c1854eff3d600251916b8e3fba9674dead15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
8b3cfcf163 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18091363 Change-Id: Iad3380dcbf034a522d68d8997a4785902669cc88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Refine MSG_DELAY_POLLING enqueue conditionGeorge Chang
Bug: 231411134 Test: manual Merged-In: I0b2526c56b51f7d8e43ed412d44f04410a7e7a19 Change-Id: I0b2526c56b51f7d8e43ed412d44f04410a7e7a19
2022-05-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3b1b320f5e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18091365 Change-Id: I0d9b99817a0d0998579e3a86bf088d071cfd74eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I84b6407a7203afc5f5901fae2162e4fe6342c0e1
2022-04-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id4fa380b507e77c89ad62259b12215e747978a6c
2022-04-28Snap for 8505378 from fc1c5872cd935a835624562248b91cd2cf3c5ad6 to ↵Android Build Coastguard Worker
mainline-go-tzdata4-release Change-Id: I005e63cd454972f462a3eb368f389e3573ac0b6e
2022-04-28Merge "Correct the default payment selection for multiple profiles" into ↵TreeHugger Robot
tm-dev am: 6cccd7fa4a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/17822820 Change-Id: I507548044664d38469d6463b0e27799b26a3b710 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 15:54:07 +0000