Automerger Merge Worker
4a108dd3e2
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 5a886e51a6 am: 0f34eda3df am: a1f7f0c813
...
Change-Id: I9b068edb7505fbf114fdccb51d25aff49ca388ab
2020-03-06 08:01:01 +00:00
Automerger Merge Worker
0a270a947f
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03 am: c6859fb377 am: 8ae448ea81
...
Change-Id: Ie1b889b06b31ae449579aa202a365280f3dd6300
2020-03-06 07:58:38 +00:00
Automerger Merge Worker
70bf55f837
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8 am: 59b0979ed8 am: cc98169eae
...
Change-Id: I81b5fb3fbd6ffddd1da8a33f6b04d1925b44679b
2020-03-06 07:57:40 +00:00
Automerger Merge Worker
6ab3f4ff66
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 5585d61a51 am: 56f80dad28 am: bf7eb744c6
...
Change-Id: I42ad6a84bfd8970c2ede3167830d6eaeed3b40a3
2020-03-06 07:50:25 +00:00
Automerger Merge Worker
cb2c8f3cdc
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8 am: 5cd16c76ab
...
Change-Id: Id529c918389b3bb909b36b2fce81eeba283de3c2
2020-03-06 07:45:46 +00:00
Automerger Merge Worker
cc98169eae
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8 am: 59b0979ed8
...
Change-Id: I4575da0be76e80ed4d596bb4f7847df7128ada3a
2020-03-06 07:45:23 +00:00
Automerger Merge Worker
18c6dac469
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 am: f033a896ff am: 2fc342a7bf
...
Change-Id: Id39d0380a97707e8bef03bd325260d62d965c05d
2020-03-06 07:31:08 +00:00
Automerger Merge Worker
59b0979ed8
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8
...
Change-Id: I5177a15280048f62d67a5c27f069df1e0c6cd313
2020-03-06 07:25:04 +00:00
Automerger Merge Worker
5cd16c76ab
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8
...
Change-Id: I8693afc41c9f0eac5bf9d08158d0b6b32a06d01f
2020-03-06 07:24:45 +00:00
Yi-Ling Chuang
db4fd2b1c3
Ignore some failed tests.
...
These test failures may relate to change of PowerManager. Ignore them
first and will have people working on the fix.
Bug: 150914017
Test: robotests
Change-Id: Id4d3bb9945a993517964376b5d52e31dd293e634
2020-03-06 15:20:09 +08:00
Automerger Merge Worker
46241f0cf7
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03 am: 8681e4fd57 am: dfb634ddcf
...
Change-Id: I59299ed04c804f12ddd1e0dfd1700647d6c861d2
2020-03-06 07:16:02 +00:00
Automerger Merge Worker
870ff4581e
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 am: b6dccade98 am: afe7bcae29
...
Change-Id: I234d9c77b430f7240351066df867393010d87b4f
2020-03-06 07:15:26 +00:00
Automerger Merge Worker
a1f7f0c813
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 5a886e51a6 am: 0f34eda3df
...
Change-Id: I89c623efa1ca4cdeeef9caac463c69cc124bcfa1
2020-03-06 07:15:14 +00:00
Automerger Merge Worker
8ae448ea81
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03 am: c6859fb377
...
Change-Id: I288c8094a53900e9c15dfc795208a98d84c9d4b4
2020-03-06 07:15:08 +00:00
Automerger Merge Worker
dfb634ddcf
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03 am: 8681e4fd57
...
Change-Id: I4a232b06275c0f11c7ef55ed95efb38324a77a06
2020-03-06 07:15:08 +00:00
Automerger Merge Worker
32080a92e8
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54
...
Change-Id: I6923626d227d0c4c82989949f7f1bffeb165c00d
2020-03-06 07:08:57 +00:00
Automerger Merge Worker
8681e4fd57
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03
...
Change-Id: I213be4da3435caa3073e289c5012f599bc6aa29e
2020-03-06 07:03:20 +00:00
Automerger Merge Worker
0f34eda3df
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 5a886e51a6
...
Change-Id: I572bfa6e141fbac45bcf5074ffcad6ccc992a3ba
2020-03-06 07:03:20 +00:00
Automerger Merge Worker
c6859fb377
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03
...
Change-Id: I53fc0eae3f233e8adb871fe36ef904cbca5ce1e3
2020-03-06 07:03:01 +00:00
tim peng
2d15cecf54
Merge "Add getSessionName() API for group name in worker" into rvc-dev
2020-03-06 06:56:30 +00:00
Automerger Merge Worker
bf7eb744c6
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 5585d61a51 am: 56f80dad28
...
Change-Id: I56c85307efd4e773731c8c842f1626b2ef086412
2020-03-06 06:54:04 +00:00
Automerger Merge Worker
2fc342a7bf
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 am: f033a896ff
...
Change-Id: I48bb25b6b091434d5eaf70c0cfa339a90a713763
2020-03-06 06:53:20 +00:00
Automerger Merge Worker
afe7bcae29
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 am: b6dccade98
...
Change-Id: Ieab18f8fb2769afff73bbc9e5b1409e08bde9ab4
2020-03-06 06:52:56 +00:00
hughchen
fbea0dc06d
Ignore failed test cases
...
Bug: 150909916
Test: make RunSettingsRoboTests -j42
Change-Id: Ice6c8e635a0a39c0cf86ad60e0175222cf32cf4b
2020-03-06 14:52:22 +08:00
Automerger Merge Worker
5a886e51a6
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c
...
Change-Id: Ia1711e7a5f33f967ab39cc7f43a2e102dc1dd642
2020-03-06 06:44:51 +00:00
Automerger Merge Worker
0e4b3e2d03
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c
...
Change-Id: Iaa9b5708c70120bd64c1df79af82bb08bd45be2f
2020-03-06 06:44:44 +00:00
Automerger Merge Worker
b6dccade98
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31
...
Change-Id: Iccd988b73822fef179ed23457080d7fff1503b11
2020-03-06 06:38:15 +00:00
Automerger Merge Worker
56f80dad28
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 5585d61a51
...
Change-Id: I0966351b670a048544bc47d9ee4ab24eac6cf2a1
2020-03-06 06:38:13 +00:00
Automerger Merge Worker
340df31ff3
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: 081c161005 am: 56884a847d am: cecb14d5bd
...
Change-Id: I0365f2fdfbe658feb1fc82271f99254197c45c05
2020-03-06 06:37:45 +00:00
Automerger Merge Worker
f033a896ff
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31
...
Change-Id: If9964ee4569c18b27dba54c2db6e200ac7df253e
2020-03-06 06:37:45 +00:00
TreeHugger Robot
a6760b347c
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev
2020-03-06 06:27:29 +00:00
Automerger Merge Worker
11a8899408
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: ac742b040a am: 9d8a7dfe5a
...
Change-Id: I95a193d0158c7cf4c37cf083858f713845fe2e46
2020-03-06 06:18:42 +00:00
Automerger Merge Worker
5585d61a51
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266
...
Change-Id: Ifa92c4ff403eca485552a2cbc265c41472405e26
2020-03-06 06:14:49 +00:00
Automerger Merge Worker
54fddb8d31
Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266
...
Change-Id: Ibf9f04e2ea4f0d44814d65919dfc7d7f60b31fd5
2020-03-06 06:14:42 +00:00
Automerger Merge Worker
bf959a0529
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours am: f8d7068d84 am: 73800ebe86 am: 59ce64af51 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0267b2bf616f5e3cc1a575cc102baee85a4064e8
2020-03-06 06:08:20 +00:00
Automerger Merge Worker
ddcad9a236
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours am: 9b03774e7c am: 60a9d95880 am: 8c2c41340f -s ours
...
am skip reason: subject contains skip directive
Change-Id: If9d4f8c16865a239d35d5c9a032de676b6e49e47
2020-03-06 06:07:50 +00:00
TreeHugger Robot
4d611d3c48
Merge "Ignore some broken tests"
2020-03-06 05:59:55 +00:00
menghanli
a5936ba266
Fix Robotests failure on accessibility ShortcutPreference
...
Bug: 150906744
Bug: 150910193
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ShortcutPreferenceTest
Change-Id: I2feaad60eae3688f6452c29242affc55a80411a0
2020-03-06 13:39:15 +08:00
Tim Peng
bd56ef94d2
Add string for output switcher transferring state
...
Bug: 150903460
Test: manual
Change-Id: Iaebe013e891300f3275ff551e79e3298e55e21c4
2020-03-06 13:14:07 +08:00
Automerger Merge Worker
cecb14d5bd
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: 081c161005 am: 56884a847d
...
Change-Id: I3a6144aa03cc59d500207daed1691b288cdb4289
2020-03-06 05:04:14 +00:00
Automerger Merge Worker
9d8a7dfe5a
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: ac742b040a
...
Change-Id: Id26179b8b4bc9f21b91426b1946289a2d40efd89
2020-03-06 04:44:56 +00:00
Automerger Merge Worker
59ce64af51
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours am: f8d7068d84 am: 73800ebe86
...
Change-Id: Ia1b750b9781a6a115c4e1dd06ce79ad106e61790
2020-03-06 04:31:17 +00:00
Automerger Merge Worker
8c2c41340f
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours am: 9b03774e7c am: 60a9d95880
...
Change-Id: I30a8b7f464cdd5b46e1ad5ec514b857b218d08ea
2020-03-06 04:30:42 +00:00
Automerger Merge Worker
58193c352d
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: 1cf856987b am: 702e5bb44f am: d5daf57e66
...
Change-Id: I9598432d18cb9c3520433c9e568e888ee6758a3c
2020-03-06 04:25:59 +00:00
Yi-Ling Chuang
91ec8ce068
Fix AdaptiveSleepPreferenceControllerTest.
...
Fixes: 150910069
Test: robotests
Change-Id: Ie8c33533747d17ec4f0571f5c7ea2de82ce7c66e
2020-03-06 12:14:01 +08:00
Automerger Merge Worker
d5daf57e66
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: 1cf856987b am: 702e5bb44f
...
Change-Id: I1c796271534f824bd68617917beafefd2ed1055d
2020-03-06 04:11:11 +00:00
Tsung-Mao Fang
9a32a3c86c
Ignore some broken tests
...
In order to running presubmit asap,
we ignore broken tests first.
Test: Run robotest
Bug: 150910070
Change-Id: I6c774eeef7d81b085e5dc4d8f6066b103c54c6cf
2020-03-06 12:10:47 +08:00
Automerger Merge Worker
702e5bb44f
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: 1cf856987b
...
Change-Id: I1ae3557444b95d625287d0872792ab042098d005
2020-03-06 03:55:45 +00:00
Chris Tate
12ed043fdb
Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
...
Revert submission 10556828-am-2e2e7004e4cb4ef8b776d65e9ffe33f3
Reason for revert: Should never have automerged downstream from qt-dev; the entire topic should have been skipped.
Reverted Changes:
I241d8d8da:DO NOT MERGE - Track framework changes to crashApp...
Ib1a5695f9:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I3e6eb3f5c:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Ibe4652916:DO NOT MERGE - Track framework changes to crashApp...
Change-Id: Ic68e376aa93c5c22a499d87f001bd22314c3f46e
2020-03-06 03:54:52 +00:00
Automerger Merge Worker
56884a847d
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: 081c161005
...
Change-Id: Ib09b0f3bc7d3e282a4a7868130794d21f0981ea3
2020-03-06 03:39:06 +00:00
