Automerger Merge Worker
b733061311
Merge "Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: 8482a5396a" into rvc-d1-dev-plus-aosp
2020-04-06 05:49:56 +00:00
TreeHugger Robot
610c4486be
Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: 8482a5396a
...
Change-Id: Id5c991732e85b45bd492ae7263f6798a12d0137b
2020-04-06 05:49:52 +00:00
TreeHugger Robot
feb1b3547a
Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2
...
Change-Id: I11ae2175b744ad2dcf33164bfae8b9c99ec6cf5d
2020-04-06 05:49:50 +00:00
TreeHugger Robot
c193222b18
Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2
...
Change-Id: I82098553d60f60eb4bdd0e1eaaa7343981c02755
2020-04-06 05:49:46 +00:00
TreeHugger Robot
b27a20a968
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours am: 0e0119d83a -s ours am: e48b6a0539 -s ours am: e1a9e9bb78 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
2020-04-06 05:39:08 +00:00
TreeHugger Robot
8482a5396a
Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4
...
Change-Id: Icbba62d578e37990f69b319c689365aea14527d4
2020-04-06 05:38:51 +00:00
Mark Chien
ec8f27fd15
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: b4f3d54445 am: c24bd8b0f8 am: e27e788970 am: 387b6bb2ff
...
Change-Id: Ic95582784580f2e6de08350eff08a0740fa0cd5f
2020-04-06 05:38:46 +00:00
TreeHugger Robot
bf57fc64e2
Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4
...
Change-Id: I3de538d7575f4691e0aa09538bbbee19ec326493
2020-04-06 05:38:35 +00:00
Toby Chuang
204fa8a420
[NFC] Add a picture under NFC settings to show NFC detection point.
...
Each smartphone has a different NFC antenna detection point,
users would confuse where the NFC antenna is and how to place the
smartphone close to the card reader/equipment.
Starting from Android R device, we move NFC antenna position from
top area to middle center of the phone.
From the OEMs perspective, they could implement their own picture
to indicate the best NFC detection point.Hence, we propose to
show NFC antenna position under NFC setting.
Bug: 142230563
Test: build pass
Change-Id: Ib3cd7fc3ea299be1667aba0aeebaa148fb49015f
2020-04-06 13:37:31 +08:00
TreeHugger Robot
d81224b7d4
Merge "Update permission summary when permission changing." into rvc-dev
2020-04-06 05:22:01 +00:00
TreeHugger Robot
e1a9e9bb78
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours am: 0e0119d83a -s ours am: e48b6a0539 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
2020-04-06 05:21:38 +00:00
Mark Chien
387b6bb2ff
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: b4f3d54445 am: c24bd8b0f8 am: e27e788970
...
Change-Id: Ia040cb14f16d31a9c2089bb74ab2c15e2e52e406
2020-04-06 05:21:25 +00:00
TreeHugger Robot
bc13bd64e9
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6d4ac39033 -s ours am: e61629a352 -s ours am: 0103567e77 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
2020-04-06 05:11:50 +00:00
Mark Chien
93f939472e
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: 6803712526 am: 82d1bb8aba am: ff8d81b1fa
...
Change-Id: Id8ee8c0679e964de98e496f061374af65fc0881e
2020-04-06 05:11:45 +00:00
TreeHugger Robot
31f0f351fb
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours am: e2a959f025 -s ours am: bcb873dce0 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
2020-04-06 05:11:31 +00:00
Mark Chien
ff814fa324
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: b4f3d54445 am: c161952940 am: 6655c479b7
...
Change-Id: I3bc99cc0ac73c3fbadca2271a6a190b04ce4c722
2020-04-06 05:11:05 +00:00
TreeHugger Robot
e48b6a0539
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours am: 0e0119d83a -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
2020-04-06 05:01:55 +00:00
Mark Chien
e27e788970
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: b4f3d54445 am: c24bd8b0f8
...
Change-Id: I5c06ee0ab12ddb2c979ff3b192d92f7db62e46e2
2020-04-06 05:01:42 +00:00
TreeHugger Robot
0103567e77
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6d4ac39033 -s ours am: e61629a352 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
2020-04-06 05:00:05 +00:00
Mark Chien
ff8d81b1fa
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: 6803712526 am: 82d1bb8aba
...
Change-Id: I29020b573b435c1d9f356952442f1203fd1aee54
2020-04-06 04:59:58 +00:00
TreeHugger Robot
bcb873dce0
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours am: e2a959f025 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
2020-04-06 04:59:45 +00:00
Mark Chien
6655c479b7
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: b4f3d54445 am: c161952940
...
Change-Id: Iece105a78574e09d7d1a52fb8f69c7f20ed19063
2020-04-06 04:59:32 +00:00
TreeHugger Robot
e61629a352
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6d4ac39033 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
2020-04-06 04:39:55 +00:00
TreeHugger Robot
0e0119d83a
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
2020-04-06 04:39:47 +00:00
Mark Chien
82d1bb8aba
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: 6803712526
...
Change-Id: I8b06b6f5130aa53fa349f5db2b434d5626f45457
2020-04-06 04:39:45 +00:00
Mark Chien
c24bd8b0f8
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: b4f3d54445
...
Change-Id: I3c325a410bbffad8e1a6b8082669e04410b21f2f
2020-04-06 04:39:42 +00:00
TreeHugger Robot
e2a959f025
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
2020-04-06 04:38:55 +00:00
Mark Chien
c161952940
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: b4f3d54445
...
Change-Id: I6d8d190e919e0d637089c66f53b815113a30331a
2020-04-06 04:38:46 +00:00
ChenJean
aa87e024d5
Support caption second UI structure (5/n)
...
Update constants
Bug: 143502915
Test: manual
Merged-In: I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1
Change-Id: I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1
(cherry picked from commit ba7eb47823
2020-04-06 04:20:05 +00:00
ChenJean
9e1bb0def1
Support autoclick secondary action (8/n)
...
Modify options description logic from 5 types to 3 types.
Bug: 149884746
Test: manual
Merged-In: I714db2a450e34d33e5728cf355136d26bef77e11
Change-Id: I714db2a450e34d33e5728cf355136d26bef77e11
(cherry picked from commit b6d6d9da46
2020-04-06 04:19:16 +00:00
TreeHugger Robot
6d4ac39033
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
2020-04-06 04:18:35 +00:00
Mark Chien
6803712526
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba
...
Change-Id: If8c1fa7af073dcd666ab0c46d4f04308493092a1
2020-04-06 04:18:29 +00:00
TreeHugger Robot
6e187d076b
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
2020-04-06 04:18:21 +00:00
Mark Chien
b4f3d54445
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba
...
Change-Id: I4a89c742083b7a70c601ea7a72a3dc811b3b9241
2020-04-06 04:18:11 +00:00
TreeHugger Robot
f1418dc437
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
2020-04-06 04:07:20 +00:00
Mark Chien
e0399b18ba
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev
2020-04-06 04:04:07 +00:00
TreeHugger Robot
9643b9c727
Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev
2020-04-06 03:49:07 +00:00
Tim Peng
85055801fe
No feedback when attempting to transfer to an unpowered BT device
...
-Set title and subtitle when connecting state changes
-Add test cases
Bug: 152606143
Test: make -j42 RunSettingsRoboTests
Change-Id: I1c482e8f45752d658d7898de760594fd3ec7164d
2020-04-06 01:19:28 +00:00
Howard Chen
621a13af7a
Add security patch level check in DSULoader am: 9266fe32f7 am: 5fcb285460 am: 58175681ec am: 558b12aae7 am: 13fa095630
...
Change-Id: Ide246f126ce0437bf44d55a3dae9ea2802938769
2020-04-05 09:58:31 +00:00
Howard Chen
13fa095630
Add security patch level check in DSULoader am: 9266fe32f7 am: 5fcb285460 am: 58175681ec am: 558b12aae7
...
Change-Id: I0ea29a1b8f25f42eb37242f597d3d854cb81e10d
2020-04-05 09:52:08 +00:00
Howard Chen
398329268c
Add security patch level check in DSULoader am: 9266fe32f7 am: fc2e4cc7f6 am: 89b00ccf9f am: 1604338ca7
...
Change-Id: Ib1d03698da8e6d31c3f69aea1e72586f27dcf99c
2020-04-05 09:51:25 +00:00
Howard Chen
bfad910fde
Add security patch level check in DSULoader am: 9266fe32f7 am: 5fcb285460 am: ce10bf6aec am: d04017e838
...
Change-Id: I0628044743577eb3b5708ad4ed06038fb5c68330
2020-04-05 09:51:11 +00:00
Howard Chen
1604338ca7
Add security patch level check in DSULoader am: 9266fe32f7 am: fc2e4cc7f6 am: 89b00ccf9f
...
Change-Id: Iae2f197f2859ad37dbb0ce2e51fa5c6f943c8fbc
2020-04-05 09:40:26 +00:00
Howard Chen
d04017e838
Add security patch level check in DSULoader am: 9266fe32f7 am: 5fcb285460 am: ce10bf6aec
...
Change-Id: I7eeb92b68eb3019458a4c32ea72b1433151904de
2020-04-05 09:40:19 +00:00
Howard Chen
558b12aae7
Add security patch level check in DSULoader am: 9266fe32f7 am: 5fcb285460 am: 58175681ec
...
Change-Id: I1311d3b7a74b40f29b35ed4f0450d0c9f70fc117
2020-04-05 09:40:18 +00:00
Howard Chen
58175681ec
Add security patch level check in DSULoader am: 9266fe32f7 am: 5fcb285460
...
Change-Id: Ifd631a3ad0ac3aca79524ed09112f5ba7b3f4cdb
2020-04-05 09:18:29 +00:00
Howard Chen
89b00ccf9f
Add security patch level check in DSULoader am: 9266fe32f7 am: fc2e4cc7f6
...
Change-Id: I1e317a1b89fae5e30776738adb659c420d5ab329
2020-04-05 09:18:28 +00:00
Howard Chen
ce10bf6aec
Add security patch level check in DSULoader am: 9266fe32f7 am: 5fcb285460
...
Change-Id: I5b1b5330abd1781fb24428f4f16023601c726156
2020-04-05 09:17:30 +00:00
Howard Chen
fc2e4cc7f6
Add security patch level check in DSULoader am: 9266fe32f7
...
Change-Id: Ib65b8ed8c51dac8a870fed23807288bd754ba6d4
2020-04-05 09:08:01 +00:00
Howard Chen
5fcb285460
Add security patch level check in DSULoader am: 9266fe32f7
...
Change-Id: I61ced9a74bf81636d6fa40d8346c212f4d5b9d1a
2020-04-05 09:05:10 +00:00
