Commit Graph

59990 Commits

Author SHA1 Message Date
Automerger Merge Worker
e911b37450 Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be am: 9225023a2d
Change-Id: I6d36becdb1c6273811858be2193efc7ee8a5d075
2020-03-06 09:22:49 +00:00
Automerger Merge Worker
5d67642062 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 am: 6713550398
Change-Id: Ie859e14ddbe191906de36749de520a01a43d59b3
2020-03-06 09:22:37 +00:00
Automerger Merge Worker
9225023a2d Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be
Change-Id: I2df380ad1c74c3d93fc0ec5f493fa5ddab039d22
2020-03-06 09:11:41 +00:00
Automerger Merge Worker
ee76e109ac Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 4a7ba9a3c9 am: 590754734c
Change-Id: Ie25aa03f754edd5b9fa7ae4f48b3c3605796bde3
2020-03-06 09:11:27 +00:00
Automerger Merge Worker
6713550398 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219
Change-Id: Id273c8a1bc1bbf51b8fb475eb03e7d19447e1c02
2020-03-06 09:11:22 +00:00
Automerger Merge Worker
8be83502be Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506
Change-Id: Ia3e859432dada22a9bcdeb90eb7140b537b67434
2020-03-06 08:57:34 +00:00
Automerger Merge Worker
7e89b41219 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17
Change-Id: I95978fe3e4f797fa94ddd51701e92b8f4cd6142f
2020-03-06 08:57:23 +00:00
Automerger Merge Worker
590754734c Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 4a7ba9a3c9
Change-Id: I933bc9a6f7d96e06124e1e7082ce5b3efa12b436
2020-03-06 08:57:17 +00:00
Automerger Merge Worker
223199e10c Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 5b97ecf287
Change-Id: I7aa399f76a0b5f84aa1716896cc0921b5181d2e2
2020-03-06 08:57:16 +00:00
TreeHugger Robot
90d5d45506 Merge "Ignore failed test cases" into rvc-dev 2020-03-06 08:48:25 +00:00
Automerger Merge Worker
4a7ba9a3c9 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0
Change-Id: I0880e13a0bb8ac2cc3f4a2db21fe049d71da629a
2020-03-06 08:45:19 +00:00
Lee Chou
f3ce231d17 Merge "Require authorization before turning off eSIM security feature" into rvc-dev 2020-03-06 08:45:09 +00:00
Automerger Merge Worker
5b97ecf287 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0
Change-Id: I120d9b2135ed0c6d65461dde644d5a55559c85d4
2020-03-06 08:45:07 +00:00
Automerger Merge Worker
696d25adf0 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb
Change-Id: Ib3566a792f6d8671e4b4e84f64ed67f4c27eed86
2020-03-06 08:23:30 +00:00
Menghan Li
b6ab224ddb Merge "Update edit shortcut dialog measurements and assets." into rvc-dev 2020-03-06 08:01:59 +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
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
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
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
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
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
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
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
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
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
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
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
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