Commit Graph

65261 Commits

Author SHA1 Message Date
TreeHugger Robot
d4aaa12647 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: 2fa2b57ec2 am: fbd921f1cb am: 39ce1bfb9f
Change-Id: I893a055d7ccf7a2c6c2446b3ec6738f2d0864903
2020-04-13 03:58:59 +00:00
George Chang
96e5e005f1 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: f4d5666aea am: eb3ae0d91f am: 13275fbdfe
Change-Id: I934482d57daefc87d1e70b55826a046240897288
2020-04-13 03:58:52 +00:00
TreeHugger Robot
f044ae9bce Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf am: b4b63b60b9 am: 83646cd7fc
Change-Id: If1cb9c424658b44ad5f3ddf2e56730973de3ee12
2020-04-13 03:58:44 +00:00
George Chang
dd4ef7e5bd Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a am: 270ea3400b am: e7b5086dd1
Change-Id: Ia66e6d95715674c409dd17b583a20b957e58ce8d
2020-04-13 03:58:19 +00:00
TreeHugger Robot
39ce1bfb9f Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: 2fa2b57ec2 am: fbd921f1cb
Change-Id: I13575875901ba97ed045558fb75b9942cc9e4331
2020-04-13 03:40:30 +00:00
George Chang
13275fbdfe Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: f4d5666aea am: eb3ae0d91f
Change-Id: I1f49a0df74bdfdd0263f6167a2a69d35d176cd31
2020-04-13 03:40:24 +00:00
TreeHugger Robot
83646cd7fc Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf am: b4b63b60b9
Change-Id: I45838699c3682dc39bfc4f70db549b72e70a3d91
2020-04-13 03:40:18 +00:00
George Chang
e7b5086dd1 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a am: 270ea3400b
Change-Id: I757d7573aab372d8f35b838e9b287308e5d142d2
2020-04-13 03:39:57 +00:00
TreeHugger Robot
fbd921f1cb Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: 2fa2b57ec2
Change-Id: I97f363d5e7de827431277d8d165091a752d30b1f
2020-04-13 03:20:42 +00:00
George Chang
eb3ae0d91f Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: f4d5666aea
Change-Id: Ice57316045b378a3798205fb9eba48137a169866
2020-04-13 03:20:16 +00:00
TreeHugger Robot
b4b63b60b9 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf
Change-Id: I93601a9885636fd81759d629203e26fd43dcbf73
2020-04-13 03:18:42 +00:00
George Chang
270ea3400b Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a
Change-Id: Iae7ec5f9d2cb9a59ea2dbaf65dcb3bcc8bbbb7aa
2020-04-13 03:18:31 +00:00
TreeHugger Robot
2fa2b57ec2 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f
Change-Id: Ifa0eadf6b26b46c2cc0a2f57628a12ea2f7363f3
2020-04-13 03:00:51 +00:00
George Chang
f4d5666aea Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7
Change-Id: I8208b97e26b28fffd435703e0aacea051d95aed2
2020-04-13 03:00:40 +00:00
TreeHugger Robot
a287641adf Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f
Change-Id: Id19154bf9ae37556f4d2284cb4168a76405aeb83
2020-04-13 02:59:19 +00:00
George Chang
5a6d05885a Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7
Change-Id: I96469f4d0938d9f5f913ee531d4e5e72a11a7ed4
2020-04-13 02:59:05 +00:00
TreeHugger Robot
c56bcb5e7f Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev 2020-04-13 02:45:04 +00:00
George Chang
0181643bb7 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev 2020-04-13 02:43:35 +00:00
TreeHugger Robot
7d2a7d6300 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: 0260b6bc92 am: 84559ccf8f am: dec16027e2
Change-Id: Iaa50becf5a3cc3e97e8bc2d09767a64943cc9d33
2020-04-13 01:55:46 +00:00
George Chang
28895f2822 [NFC] Disable contactless payments when no payment application installed
Bug: 153821082
Bug: 149270345
Test: Check settings
Change-Id: I5162ecb07c26a33427305b6cf65829b2c61ad317
2020-04-13 01:53:23 +00:00
TreeHugger Robot
dec16027e2 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: 0260b6bc92 am: 84559ccf8f
Change-Id: I94c1001ddf00e4f715aa938f92baa02a542885a1
2020-04-13 01:46:20 +00:00
TreeHugger Robot
58400ba110 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 0b653fe083 am: c3428c24ff am: 6f0c8d9957
Change-Id: Ibaf84e08605a7e81af5a2d85f00db634150ef7d7
2020-04-13 01:43:13 +00:00
TreeHugger Robot
d445934279 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: d2b330f5ef am: 2e7b71dce7
Change-Id: I7fe65de1a8576603a1b43123d7544872cfa66c7b
2020-04-13 01:42:25 +00:00
TreeHugger Robot
6f0c8d9957 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 0b653fe083 am: c3428c24ff
Change-Id: I2e8d56d1c9b38b1df534cb53fc90efe583f70f4a
2020-04-13 01:31:22 +00:00
TreeHugger Robot
2e7b71dce7 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: d2b330f5ef
Change-Id: I8869b5b005c5ce75983bc1c7781699dfbfdd79e4
2020-04-13 01:31:16 +00:00
TreeHugger Robot
84559ccf8f Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: 0260b6bc92
Change-Id: I4121edd2128f1c451b508b12be4460b280de8191
2020-04-13 01:30:59 +00:00
TreeHugger Robot
0260b6bc92 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3
Change-Id: I05c0cf2645d1780e40f82d34c39506c83bde43da
2020-04-13 01:13:01 +00:00
TreeHugger Robot
c3428c24ff Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 0b653fe083
Change-Id: I1bcf8ac297f930345af852c7a2b49a4049a8760f
2020-04-13 01:13:00 +00:00
TreeHugger Robot
d2b330f5ef Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3
Change-Id: Ie00b07ebe6e474e5371bf12ed851e91be116a4a6
2020-04-13 01:11:27 +00:00
TreeHugger Robot
0b653fe083 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872
Change-Id: Ibd5efd60fdd6c4678d95b3e41e9bd0c4e45330ac
2020-04-13 00:49:42 +00:00
TreeHugger Robot
35d8c0bdb3 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872
Change-Id: Ifbd95c73fd5e862163157fd7cab49ff4c0a12ddd
2020-04-13 00:48:10 +00:00
TreeHugger Robot
545f08e872 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev 2020-04-13 00:28:11 +00:00
Bonian Chen
34d59689a2 [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours am: 9e0dea0c05 -s ours am: 3390caf31d -s ours am: 6ae8610b2a -s ours
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: I13ec1e64af0677729522bf41e0eb168a9c13dbc4
2020-04-12 19:19:27 +00:00
Bonian Chen
6ae8610b2a [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours am: 9e0dea0c05 -s ours am: 3390caf31d -s ours
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: If2d670f4c83b3b77c0dcf07211b3914b5a2283ea
2020-04-12 18:59:24 +00:00
Bonian Chen
3390caf31d [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours am: 9e0dea0c05 -s ours
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: Ib2d4f7e0c285430e1616217cf745c557e09240bc
2020-04-12 18:40:25 +00:00
Bonian Chen
9e0dea0c05 [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: I7d0f1d8d93b4dfee1ef8e7a6b42b967d55192f0e
2020-04-12 18:24:46 +00:00
Bonian Chen
74e3771df3 Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96
Change-Id: I898b16508649f6f0f11002a810089b4d9c133a4e
2020-04-12 18:02:49 +00:00
Bonian Chen
d43db12f96 Merge "[Settings] Avoid from crash when pull out SIM" 2020-04-12 17:42:45 +00:00
Robert Luo
afb01f12cd Fix NFC UI is not available when switching to 2nd user
Bug: 152581438
Test: (1) make -j42 RunSettingsRoboTests (2) check NFC UI and function work as 2nd user
Change-Id: Ibf0346b992406c1d6329580083c1cd49180376cf
2020-04-12 15:27:18 +08:00
TreeHugger Robot
4a0a7238d9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: e7c0cff6a0 -s ours am: 11ab1464c4 -s ours am: c251150bb7 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4321922d32d0f12024de42b18deadfcfbd49391
2020-04-11 23:45:18 +00:00
TreeHugger Robot
c251150bb7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: e7c0cff6a0 -s ours am: 11ab1464c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I852e696ab68d907df3dd7aab2a6231c4974d384f
2020-04-11 23:37:37 +00:00
TreeHugger Robot
72c3746400 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: 458ffc97a0 -s ours am: 8fc8a2e133 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia519f2805552a1a3aea431a0f90656c9a52fe6ce
2020-04-11 23:34:39 +00:00
TreeHugger Robot
11ab1464c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: e7c0cff6a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I65d0dc38fc54ff8153f644ff57f41f0740654c5b
2020-04-11 23:18:49 +00:00
TreeHugger Robot
8fc8a2e133 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours am: 458ffc97a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I1bf323ee2cb547228e230160e1b388e6c1f0832a
2020-04-11 23:17:44 +00:00
TreeHugger Robot
e7c0cff6a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours
am skip reason: subject contains skip directive

Change-Id: I0c8c5a3623151dea336dfae92932e6e769d43853
2020-04-11 23:00:39 +00:00
TreeHugger Robot
458ffc97a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours
am skip reason: subject contains skip directive

Change-Id: Iad746f8a6a22da774183acdf8ba1da062902a6fd
2020-04-11 22:58:58 +00:00
TreeHugger Robot
29b22263c5 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-11 22:43:33 +00:00
Bill Yi
bb97b1e6b5 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours am: e19e364142 -s ours am: 0a7e821da3 -s ours am: 1cde54c4de -s ours
am skip reason: subject contains skip directive

Change-Id: Ib255b0c48e216d1a8aedcfa3c8e49bb34274ec36
2020-04-11 22:37:18 +00:00
Bill Yi
1cde54c4de [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours am: e19e364142 -s ours am: 0a7e821da3 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b3fb257f6eaff0de75794ce273d51a67a3fdc9c
2020-04-11 22:30:52 +00:00
Bill Yi
d25af30f48 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours am: 48acb04b48 -s ours am: 0442a93442 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib80cdf05027a651b9096b953c19a3ddf5340ab1d
2020-04-11 22:27:32 +00:00