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
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
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
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
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
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
TreeHugger Robot
90d5d45506
Merge "Ignore failed test cases" into rvc-dev
2020-03-06 08:48:25 +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
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
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
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
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
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
Yi-Ling Chuang
91ec8ce068
Fix AdaptiveSleepPreferenceControllerTest.
...
Fixes: 150910069
Test: robotests
Change-Id: Ie8c33533747d17ec4f0571f5c7ea2de82ce7c66e
2020-03-06 12:14:01 +08: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
Automerger Merge Worker
ac742b040a
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e
...
Change-Id: I43264354b76900c510e2a49d1f702b8440cb7e30
2020-03-06 03:39:01 +00:00
Automerger Merge Worker
e7fd1cbc4e
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76
...
Change-Id: Id9d87fb99e8329572568e064518466017c030fb5
2020-03-06 03:20:31 +00:00
Automerger Merge Worker
081c161005
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76
...
Change-Id: Ie0b97fe0fa7d8da3ad105a44f1686bac23eba775
2020-03-06 03:20:17 +00:00
Betty Chang
997a458e76
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev
2020-03-06 03:01:32 +00:00
Automerger Merge Worker
73800ebe86
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours am: f8d7068d84
...
Change-Id: I722bf3230097a9e07f9aa44c2e9e209e17dfb05a
2020-03-06 00:40:30 +00:00
Automerger Merge Worker
60a9d95880
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours am: 9b03774e7c
...
Change-Id: I01d8903db074c14d717a024fb1d082cb9490732a
2020-03-06 00:39:54 +00:00
Automerger Merge Worker
f8d7068d84
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I36730d6958077d8f43cd1bd259f2071c898c6d8e
2020-03-06 00:26:03 +00:00
Automerger Merge Worker
9b03774e7c
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia410ff9b6c93b99dc2a3e0a162bdc32881901589
2020-03-06 00:25:28 +00:00
Automerger Merge Worker
3dfc9bc59f
Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb
...
Change-Id: I841a54be0ccf815e08eed0b4d769ef01e7151317
2020-03-06 00:12:48 +00:00
Automerger Merge Worker
567f83adbe
Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17
...
Change-Id: I02042e7d32a1daa74e624c18633ef69dace67838
2020-03-06 00:12:13 +00:00
Automerger Merge Worker
90d73cdcd7
[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e -s ours
...
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history
Change-Id: I0e657d6c6db35c8d50c16996c315e1c378a0ea1f
2020-03-05 19:45:10 +00:00
Automerger Merge Worker
c752d03daf
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: 90a99332e7
...
Change-Id: I62d54c4b09958cff163815eeea16bbaa95b0d581
2020-03-05 19:40:30 +00:00
Automerger Merge Worker
90a99332e7
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
...
Change-Id: Id8ea47aadc2d443bd8ac77cca1f7fc4ba4f63eca
2020-03-05 19:33:47 +00:00
Automerger Merge Worker
fbbda91c9e
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
...
Change-Id: I8141fb2fdb2d0224e4014d9e10686ceb3b304dfd
2020-03-05 19:33:41 +00:00
TreeHugger Robot
54edae5e54
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev
2020-03-05 19:15:30 +00:00