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
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
Tsung-Mao Fang
91399607fe
Fix pendingIntent in SettingsSliceProvider could be Hijacked
...
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.
So, we enfore assign the package name for this intent,
it only can launch the settings app.
Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.
Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
(cherry picked from commit b3c0a2a6c1 )
Merged-In: Ie954d8a4b7153d6a4cac40621f363b45185990f2
2020-03-06 18:14:03 +08: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
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
Bonian Chen
3fef55d53b
Remove reference of Phoneconstants for SUBSCRIPTION_KEY
...
- use SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead of it
Test: make
Test: m RunSettingsRoboTests
Merged-In: Ic635b11c995077ebf1e143d9562b100d7730fe52
Change-Id: I42cbf1074af3b325ebb37281efd505954a2ca25c
2020-03-06 09:07:24 +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
Tim Peng
37e8a34a40
Update failed test case
...
Bug: 150909916
Test: make RunSettingsRoboTests -j42
Change-Id: I541eea02cfa553f44e6da09c993e58ef5efb1471
2020-03-06 14:53:16 +08: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
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
900b87d0c5
Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb
...
Change-Id: I7c09136d531f7a09c945c50c99200448f6757a82
2020-03-06 04:26:23 +00:00
Yi-Ling Chuang
91ec8ce068
Fix AdaptiveSleepPreferenceControllerTest.
...
Fixes: 150910069
Test: robotests
Change-Id: Ie8c33533747d17ec4f0571f5c7ea2de82ce7c66e
2020-03-06 12:14:01 +08: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
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
SongFerngWang
000ddb3194
PreferredNetworkModePreferenceController's summary no 5G item
...
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
Merged-In: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
2020-03-06 11:37:58 +08:00
Chris Tate
ab78a5cd9c
Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
...
Revert "[automerger skipped] Merge "DO NOT MERGE - Add test of f..."
Revert submission 10557201-am-f98a6c51a74d42d6bc57f980bd694e3e
Reason for revert: Should not have been automerged from qt-dev; the whole topic should have been skipped.
Reverted Changes:
I01c0b570b:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I7451c89d1:DO NOT MERGE - Track framework changes to crashApp...
Iec866858c:DO NOT MERGE - Track framework changes to crashApp...
I200606752:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Change-Id: I4099413042f3f275f75695d661c401baad85ebc1
2020-03-06 03:35:09 +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
20110a9a95
DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f
...
Change-Id: Iec866858c5b18ff5bfc1d8a2151a4c2780d82386
2020-03-06 01:43:35 +00:00