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
Automerger Merge Worker
4c8f3be0cf
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 2bce5cdd68 am: 4d7c559849 am: 3ddd62aa10
...
Change-Id: I15b7afb97f1c088f2ce2881ea4c41a456496e363
2020-03-06 12:11:08 +00:00
Automerger Merge Worker
b13c991b6c
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 3f5aa48b55 am: d763a44943 am: 5a6d68e3ed
...
Change-Id: I7003319c6987d21eee9931bc572d98dd5cf01026
2020-03-06 12:11:02 +00:00
Automerger Merge Worker
d63327d273
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: b4e56a9f35 am: 71ff7a2dd0 am: a8bfd534e2
...
Change-Id: Id49e594cb794a8d4d0132997ba0eddcff389089c
2020-03-06 12:10:49 +00:00
Automerger Merge Worker
ae1d229f0f
Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: abbb4ee257 am: ac8fd20bfb am: 46db1ae25a
...
Change-Id: I8150e80abdacd7e696a866f3d42a148b5a3993cf
2020-03-06 12:10:20 +00:00
Automerger Merge Worker
d456646ee2
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 545d58d702 am: 1bde70ca16 am: 92338caec2
...
Change-Id: I5c58091788525819a3d04b2822c594893ae80d2b
2020-03-06 12:07:27 +00:00
Automerger Merge Worker
3ddd62aa10
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 2bce5cdd68 am: 4d7c559849
...
Change-Id: I666451574e28c452ec52a78d5c0c502a270d6086
2020-03-06 11:53:42 +00:00
Automerger Merge Worker
5a6d68e3ed
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 3f5aa48b55 am: d763a44943
...
Change-Id: I7f9d003cb2f1d6424958a323cb5b1c7232528e46
2020-03-06 11:53:36 +00:00
Automerger Merge Worker
a8bfd534e2
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: b4e56a9f35 am: 71ff7a2dd0
...
Change-Id: I74c92da67efa71d77aa329b635dd14c00358cb9e
2020-03-06 11:53:24 +00:00
Automerger Merge Worker
46db1ae25a
Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: abbb4ee257 am: ac8fd20bfb
...
Change-Id: Ice5cd4f000564207d94e16a8e1d16471d6073b68
2020-03-06 11:52:52 +00:00
Automerger Merge Worker
92338caec2
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 545d58d702 am: 1bde70ca16
...
Change-Id: I92694e7f3bd123567499155c21006ba22297806b
2020-03-06 11:49:34 +00:00
Automerger Merge Worker
4d7c559849
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 2bce5cdd68
...
Change-Id: I568a3217d91d21d2da02d92623fed3aca9383380
2020-03-06 11:35:31 +00:00
Automerger Merge Worker
d763a44943
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 3f5aa48b55
...
Change-Id: Ic51efb933041e01332fca08fc62404abb633d9b0
2020-03-06 11:35:11 +00:00
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
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
8077390036
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 am: e87b903aff am: ea55b254ed am: d4fb67b0f2
...
Change-Id: I3600c4833502321ac8584caf6a6908ca4955d6ad
2020-03-06 10:31:40 +00:00
Automerger Merge Worker
d4fb67b0f2
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 am: e87b903aff am: ea55b254ed
...
Change-Id: If98205c2b438c4608e44a5d214d745becbc55c25
2020-03-06 10:31:29 +00:00
Automerger Merge Worker
96ee4aecf5
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 am: 036fe5c61b am: 56e18c5b4d
...
Change-Id: If823751729d5a31d26125bda3c55235ee96a5852
2020-03-06 10:31:07 +00: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
2020-03-06 18:14:03 +08:00
Automerger Merge Worker
56e18c5b4d
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 am: 036fe5c61b
...
Change-Id: I9e88cb72f1a548e1f573c4dedde88e62214fc775
2020-03-06 10:12:33 +00: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
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
4f8db65690
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be am: 715f9465e2 am: b87479c713 am: 1d162bf756
...
Change-Id: I61d0e0d21cc2a80a4d8aa05aa6992a28d7045d41
2020-03-06 09:45:05 +00:00
Automerger Merge Worker
1d162bf756
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be am: 715f9465e2 am: b87479c713
...
Change-Id: I65c3ee4c2456f46c446c12338de31251bd705169
2020-03-06 09:44:58 +00:00
Automerger Merge Worker
6dd5f9b0b0
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 am: e3cf2e8ef4 am: 5c9e794785 am: d537b2f532
...
Change-Id: I3113a9f0bb0455ae20b3fb439cf5428e336559bf
2020-03-06 09:44:53 +00:00
Automerger Merge Worker
e7767ff51d
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be am: 9225023a2d am: e911b37450
...
Change-Id: I11f23eab16eb02fd09f6add74b1adb5f85cfac14
2020-03-06 09:44:47 +00:00
Automerger Merge Worker
d537b2f532
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 am: e3cf2e8ef4 am: 5c9e794785
...
Change-Id: Icf54a8672fd2617e7b7181f83e2566549ae0a7ff
2020-03-06 09:44:46 +00:00
Automerger Merge Worker
cda373cfac
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 am: 6713550398 am: 5d67642062
...
Change-Id: Id1c46c334864a869f26370b7cd1732dce7c1b267
2020-03-06 09:44:34 +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
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
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
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
11bd8ce7a1
Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 4a7ba9a3c9 am: 590754734c am: ee76e109ac
...
Change-Id: I78d1e135db998e030379a74203bcd8b5b53b7c35
2020-03-06 09:11:37 +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
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
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
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
