Commit Graph

61710 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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