Automerger Merge Worker
eae534cda7
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id498eb2c8fe327e3639328d488db5900174240ec
2020-03-06 16:18:58 +00:00
Automerger Merge Worker
9a4bdcaca6
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ac28217bd616bc49859f09a9eab0a20e1d5d285
2020-03-06 16:17:35 +00:00
Automerger Merge Worker
3d6157d48e
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: e48064ea7f am: e49067b8a1
...
Change-Id: I36817768acd64beb8383f004ee895eae0858be8e
2020-03-06 15:26:02 +00:00
Automerger Merge Worker
2c7795f4b6
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: 16fcf16c45
...
Change-Id: Ic68676eae2d494822791cc56911230447009cdb7
2020-03-06 15:14:44 +00:00
Automerger Merge Worker
c0d51ca4cc
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 1ab6e8b4fb am: bdc4a744a2
...
Change-Id: Ie0f428af0000337ba6bdd70c06c34999f37f4216
2020-03-06 15:13:28 +00:00
Automerger Merge Worker
e49067b8a1
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: e48064ea7f
...
Change-Id: I5e13a5aecb534a685fea6a5732a960ade81b521d
2020-03-06 15:12:46 +00:00
Julia Reynolds
78b1848509
Log errors on history load
...
Test: manual
Bug: 150336474
Change-Id: I10e0e5ab9d51d88b67678be0f7040c360dcbcbe4
2020-03-06 10:05:30 -05:00
Automerger Merge Worker
cc5515f91f
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: a51ed4f14c am: 229e8a35bd
...
Change-Id: I8b3007d476a683635ce63365bbf1a8e482078f4c
2020-03-06 14:59:46 +00:00
Automerger Merge Worker
e48064ea7f
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369
...
Change-Id: I36ffb4c244418c85861655a6c4e00ed3a0ce1f0e
2020-03-06 14:56:15 +00:00
Automerger Merge Worker
16fcf16c45
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369
...
Change-Id: Iab6841572b093b16e7c961becaab72cf839f1ba3
2020-03-06 14:56:08 +00:00
Automerger Merge Worker
bdc4a744a2
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 1ab6e8b4fb
...
Change-Id: I0794a3dedb843e148fff1e7f74336403be879c44
2020-03-06 14:56:02 +00:00
Automerger Merge Worker
3d31627014
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: ba597a6f39 am: c36d3c6cf4
...
Change-Id: I79073ef8b47ebc61623672fb39a8b8121e45083b
2020-03-06 14:45:33 +00:00
Automerger Merge Worker
229e8a35bd
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: a51ed4f14c
...
Change-Id: I5bba3e276f8fd692e172e962aed2a5bb167f69ba
2020-03-06 14:45:23 +00:00
Automerger Merge Worker
7f80142280
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: daf3235a45
...
Change-Id: I722cc796c0b359a44570e95ba90e5e115f8debe7
2020-03-06 14:45:20 +00:00
Automerger Merge Worker
14d7c1e369
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f
...
Change-Id: Iaa48708579e6c223295134b38037e4ed53a99426
2020-03-06 14:41:35 +00:00
Automerger Merge Worker
1ab6e8b4fb
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f
...
Change-Id: I9816aac3c87fa49554badf0710edd3a217dee6bc
2020-03-06 14:41:27 +00:00
Automerger Merge Worker
c36d3c6cf4
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: ba597a6f39
...
Change-Id: I2e1823a05c3e0cbe44c5900c95eda38f89b92639
2020-03-06 14:40:24 +00:00
Anna Trostanetski
f1fe93bc2f
Merge "Fix PlatformCompatDashboardTest." into rvc-dev
2020-03-06 14:38:29 +00:00
Automerger Merge Worker
a51ed4f14c
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd
...
Change-Id: I663c8c779d99107d661278a7c8e3941a46827a9a
2020-03-06 14:34:41 +00:00
Automerger Merge Worker
daf3235a45
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd
...
Change-Id: I671b90e9fdfc0adc32f9c59ed80dd2b602346694
2020-03-06 14:34:37 +00:00
Automerger Merge Worker
ba597a6f39
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5
...
Change-Id: I6c363e7a541aa37d77897466fac1e188be9283cc
2020-03-06 14:23:13 +00:00
Automerger Merge Worker
83fb76a7fd
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5
...
Change-Id: I02c0925b503b7adb1d68c553eccb8c1f07a4d5e5
2020-03-06 14:17:42 +00:00
tim peng
c241e434d5
Merge "Add string for output switcher transferring state" into rvc-dev
2020-03-06 14:08:28 +00:00
Automerger Merge Worker
3ddd62aa10
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 2bce5cdd68 am: 4d7c559849
...
Change-Id: I666451574e28c452ec52a78d5c0c502a270d6086
2020-03-06 11:53:42 +00:00
Automerger Merge Worker
5a6d68e3ed
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 3f5aa48b55 am: d763a44943
...
Change-Id: I7f9d003cb2f1d6424958a323cb5b1c7232528e46
2020-03-06 11:53:36 +00:00
Automerger Merge Worker
a8bfd534e2
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: b4e56a9f35 am: 71ff7a2dd0
...
Change-Id: I74c92da67efa71d77aa329b635dd14c00358cb9e
2020-03-06 11:53:24 +00:00
Automerger Merge Worker
46db1ae25a
Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: abbb4ee257 am: ac8fd20bfb
...
Change-Id: Ice5cd4f000564207d94e16a8e1d16471d6073b68
2020-03-06 11:52:52 +00:00
Automerger Merge Worker
92338caec2
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 545d58d702 am: 1bde70ca16
...
Change-Id: I92694e7f3bd123567499155c21006ba22297806b
2020-03-06 11:49:34 +00:00
Automerger Merge Worker
4d7c559849
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 2bce5cdd68
...
Change-Id: I568a3217d91d21d2da02d92623fed3aca9383380
2020-03-06 11:35:31 +00:00
Automerger Merge Worker
d763a44943
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 3f5aa48b55
...
Change-Id: Ic51efb933041e01332fca08fc62404abb633d9b0
2020-03-06 11:35:11 +00:00
Automerger Merge Worker
71ff7a2dd0
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: b4e56a9f35
...
Change-Id: Ib218608b822ab3e8d6445e0cdea043ba56b5ee97
2020-03-06 11:34:52 +00:00
Automerger Merge Worker
ac8fd20bfb
Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: abbb4ee257
...
Change-Id: I61ef8c3c0b4800e4113e310a5a26d255c9ec1d59
2020-03-06 11:34:26 +00:00
Automerger Merge Worker
1bde70ca16
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 545d58d702
...
Change-Id: I21084ce86300ffd9e183a9b2e8482ba6b804a73e
2020-03-06 11:34:16 +00:00
Arc Wang
f5e9927668
[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon
...
click the gear icon will always switch to Wi-Fi detail screen.
Bug: 150911380
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedWifiEntryPreferenceTest
Change-Id: I640d180ae5684ffaa9b2adec7b1be401b2bfd89d
2020-03-06 19:27:08 +08:00
Automerger Merge Worker
d4fb67b0f2
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 am: e87b903aff am: ea55b254ed
...
Change-Id: If98205c2b438c4608e44a5d214d745becbc55c25
2020-03-06 10:31:29 +00:00
Automerger Merge Worker
2bce5cdd68
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0
...
Change-Id: I679f15c379b1ac742d9573052921f1e1080f1e65
2020-03-06 10:25:32 +00:00
Automerger Merge Worker
3f5aa48b55
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506
...
Change-Id: Ia8c7631512d6e65752bb67b630254c9975d9dacb
2020-03-06 10:25:11 +00:00
Automerger Merge Worker
b4e56a9f35
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17
...
Change-Id: Ie89044a623e320ef2b790a8f89e271988de0531a
2020-03-06 10:24:41 +00:00
Automerger Merge Worker
abbb4ee257
Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb
...
Change-Id: I71aa23a4d507d3266e096cec04c22a706ba2eb0a
2020-03-06 10:24:09 +00:00
Automerger Merge Worker
545d58d702
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54
...
Change-Id: I8e638569fd4567519f1b2072a3b77aeff74568a9
2020-03-06 10:23:55 +00:00
Automerger Merge Worker
56e18c5b4d
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 am: 036fe5c61b
...
Change-Id: I9e88cb72f1a548e1f573c4dedde88e62214fc775
2020-03-06 10:12:33 +00:00
Automerger Merge Worker
ea55b254ed
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 am: e87b903aff
...
Change-Id: Id01d884349acf57366cd926e0f869ee69ea6ee50
2020-03-06 10:12:08 +00:00
menghanli
5d7083a103
ShortcutPreference Toggle design (2/n)
...
- Removes edit shortcut disable condition.
- Shows "off" if user removes all items in edit dialog.
- Restores last time what user chosen options when show edit dialog.
Bug: 148989269
Test: Manually test
Change-Id: I105abda782999d38c92e3de9811e2fd378869e73
2020-03-06 18:02:53 +08:00
Automerger Merge Worker
e87b903aff
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26
...
Change-Id: I47e1a6f1f0c4dbe859fcacddcec3ae4f544e8961
2020-03-06 09:57:26 +00:00
Automerger Merge Worker
036fe5c61b
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26
...
Change-Id: I3847d2e6bc24f499c728dcdfe734aeb03d69b62c
2020-03-06 09:57:12 +00:00
Automerger Merge Worker
1d162bf756
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be am: 715f9465e2 am: b87479c713
...
Change-Id: I65c3ee4c2456f46c446c12338de31251bd705169
2020-03-06 09:44:58 +00:00
Automerger Merge Worker
d537b2f532
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 am: e3cf2e8ef4 am: 5c9e794785
...
Change-Id: Icf54a8672fd2617e7b7181f83e2566549ae0a7ff
2020-03-06 09:44:46 +00:00
Automerger Merge Worker
9505f30f26
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0
...
Change-Id: Ifc4ca755dbbfec5a78ee5edd79a56be1b9424eab
2020-03-06 09:44:32 +00:00
TreeHugger Robot
2093ad6ac0
Merge "Ignore some failed tests." into rvc-dev
2020-03-06 09:23:35 +00:00
Automerger Merge Worker
b87479c713
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be am: 715f9465e2
...
Change-Id: I42d240659382f4cc55a8918e4ff152340f62b9cc
2020-03-06 09:22:52 +00:00
