Commit Graph

63948 Commits

Author SHA1 Message Date
TreeHugger Robot
64de13ddeb Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf am: 5c35333116 am: 36d89020d1
Change-Id: I1d46e4ee7d04ac29ffa9a15b9589f5d41f0cfb04
2020-04-13 04:00:44 +00:00
George Chang
6aedd91388 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a am: 1cfa1b1208 am: 45c71c6223
Change-Id: Iccfea2b8c126c458d88b88832eb69af70f4b8c6f
2020-04-13 04:00:37 +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
36d89020d1 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf am: 5c35333116
Change-Id: If31b02a752fe4dee2fbe8979c66372aad8baf447
2020-04-13 03:39:03 +00:00
George Chang
45c71c6223 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a am: 1cfa1b1208
Change-Id: Ib32ae836ec369ba317fb967d804c88671861fb81
2020-04-13 03:38:56 +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
5c35333116 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf
Change-Id: I308a6ff8149fccd6fca0a301978c88b836c0cf6d
2020-04-13 03:20:16 +00:00
George Chang
1cfa1b1208 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a
Change-Id: Id356d8ea6af7b1e655b5964c4920bf1dde18f9e4
2020-04-13 03:20:08 +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
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
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
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
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
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
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
0a7e821da3 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours am: e19e364142 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic5fe8db3ca8ad3f085b652b2a572ef61d2e2f81d
2020-04-11 22:05:16 +00:00
Bill Yi
e19e364142 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours
am skip reason: subject contains skip directive

Change-Id: Ia6ba2667a8981b0a655bba90c23611d043d5a1a4
2020-04-11 21:43:50 +00:00
Bill Yi
48acb04b48 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours
am skip reason: subject contains skip directive

Change-Id: I3e631a536a9e62e58375ef2d91bb940f5b018ed0
2020-04-11 21:42:13 +00:00
Bill Yi
e5a75d999f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I4b655b05c1ffe6c5ecd9878216dfbf50b173692c
2020-04-11 12:38:18 -07:00
Bill Yi
f4fdb7aa6f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ib326e867526a7b49d3134265abf3edc8293bb5f5
2020-04-11 12:06:30 -07:00