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
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
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
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
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
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
Automerger Merge Worker
5c9e794785
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 am: e3cf2e8ef4
...
Change-Id: If143bb9c3cdae71b30f5b9ca22c169d9d081dde8
2020-03-06 09:22:46 +00:00
Automerger Merge Worker
715f9465e2
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be
...
Change-Id: I0fb54974dfd4fa0f3e13a15eb5e070e1e8f0aa23
2020-03-06 09:11:34 +00:00
Automerger Merge Worker
e3cf2e8ef4
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219
...
Change-Id: I7f0295dd33b3756bc8a8a893db75f4554a4c352d
2020-03-06 09:11:25 +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
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
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
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
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
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
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
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
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
TreeHugger Robot
a6760b347c
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev
2020-03-06 06:27:29 +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
Yi-Ling Chuang
91ec8ce068
Fix AdaptiveSleepPreferenceControllerTest.
...
Fixes: 150910069
Test: robotests
Change-Id: Ie8c33533747d17ec4f0571f5c7ea2de82ce7c66e
2020-03-06 12:14:01 +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
1cf856987b
Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e
...
Change-Id: I854e60b9980f3ad63eafa519966d98450ecb8bb8
2020-03-06 03:38:51 +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
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
86ce68877f
DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279
...
Change-Id: Ibe465291626661a7bcd4ad38e11ff1525fbab512
2020-03-06 01:35:03 +00:00
Kevin Chyn
260a77f39d
Update enrollment with API update
...
Bug: 150499348
Fixes: 150823201
Test: Builds
Test: CtsVerifier
Change-Id: Ic02b43447d1baaaa611e265498c8790d8812a12d
2020-03-05 16:39:39 -08:00
Zhen Zhang
1745955f35
Refresh summary when update state of preference
...
TogglePreferenceController won't call refresh summary for
SwitchPreference. Need to call it explicitly in updateState to update
the subtext.
Bug: 150885013
Test: Manually test
Change-Id: I0dafd78d867fc0c66906ee9a2daa7692bb15224b
2020-03-05 14:10:37 -08:00
Automerger Merge Worker
030fcde124
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e am: 29d7026da0
...
Change-Id: Ie7251022c64cbe111e793269bf079f4597da1a08
2020-03-05 20:04:19 +00:00
Automerger Merge Worker
29d7026da0
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e
...
Change-Id: I5bc5c54bde2ec94fadef01cb8639d8c025b2ecb6
2020-03-05 19:45:23 +00:00