Commit Graph

71793 Commits

Author SHA1 Message Date
TreeHugger Robot
229e76ec19 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: d9d63ebea6 am: 33e5429474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I0254419c2d5f1b6ac97afbbde0b06fdd696feedd
2020-06-20 05:08:27 +00:00
Sunny Shao
9184a9ad51 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours am: 73e27b249f -s ours am: b97e04f8da -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012

Change-Id: I65bd3548077a7564a16d80e225b465d1ad523e79
2020-06-20 05:08:20 +00:00
Sunny Shao
c97a089280 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours am: 0322929036 -s ours am: d6812eb371 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802011

Change-Id: I1297ff624ff93728bd859178c100f443ebb93c9f
2020-06-20 05:08:09 +00:00
TreeHugger Robot
33e5429474 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: d9d63ebea6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I24a7976f0928ddf8fb4755a57b6659393164f91b
2020-06-20 04:57:22 +00:00
Sunny Shao
b97e04f8da [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours am: 73e27b249f -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012

Change-Id: I76463a2ff1c75bc868f4cea49b4a27b0e7874f46
2020-06-20 04:57:01 +00:00
Sunny Shao
d6812eb371 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours am: 0322929036 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802011

Change-Id: I32af44f0f73e927fb198b55fd1677a47c0440da8
2020-06-20 04:56:53 +00:00
TreeHugger Robot
d9d63ebea6 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: If2bece909901622ae43762ed24f1fc2853d278ba
2020-06-20 04:56:52 +00:00
Sunny Shao
73e27b249f [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012

Change-Id: I27a04f69e54108cc16b472b096ba135221099950
2020-06-20 04:56:46 +00:00
TreeHugger Robot
731e6d8e5f Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I924680694eb54be8e4447e873aa195aa1f5c19c4
2020-06-20 04:43:49 +00:00
Sunny Shao
a3c637e61b [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012

Change-Id: I3f5b3413b533a0474de2ce783f0d0740a6193841
2020-06-20 04:43:38 +00:00
Sunny Shao
0322929036 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802011

Change-Id: Id9f4b77e5d32c7862d3f0106b903360cab9c267a
2020-06-20 04:38:31 +00:00
TreeHugger Robot
5b849d8ac8 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev 2020-06-20 04:35:24 +00:00
Sunny Shao
0f995b348c [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012

Change-Id: Ie2bf08f396f0f56abe4e16cb911f2f0ad4ae711b
2020-06-20 04:32:10 +00:00
Sunny Shao
6b54959afe [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802011

Change-Id: I03039040a71397c3970badd1f39d546bf2b0cf42
2020-06-20 04:26:17 +00:00
Mark Chien
3eef206a0c [automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 am: ba4af7020c -s ours am: f6c4022554 -s ours am: b7b32ad983 -s ours am: ec043b4bbb -s ours
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637

Change-Id: I90b5d6f2ff1086900701ffc866c719f767153f10
2020-06-20 04:21:10 +00:00
Mark Chien
aca8fcd987 [automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda am: 3548a5eb0e -s ours am: f19ef641c8 -s ours am: 4d929f894c -s ours am: b55043f479 -s ours
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536

Change-Id: Icc301abdecf5218c5ceb011da59e0c599cc00e84
2020-06-20 04:20:51 +00:00
Sunny Shao
af9bdcb4b5 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012

Change-Id: I744c94080ee322f7def92065538b39ef0b9213d4
2020-06-20 04:20:17 +00:00
Sunny Shao
cd328fdf28 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802011

Change-Id: I7ceb020038b0dcc729e7e5a406f5bd3479ee199c
2020-06-20 04:14:04 +00:00
Mark Chien
ec043b4bbb [automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 am: ba4af7020c -s ours am: f6c4022554 -s ours am: b7b32ad983 -s ours
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637

Change-Id: I9f7d5cf1613f0a4b6c03b5dabdb3a704bf83848e
2020-06-20 04:04:24 +00:00
Mark Chien
b55043f479 [automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda am: 3548a5eb0e -s ours am: f19ef641c8 -s ours am: 4d929f894c -s ours
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536

Change-Id: I9051bfdccee99bb80b977d036cef720eb0565fbe
2020-06-20 04:03:51 +00:00
Mark Chien
b7b32ad983 [automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 am: ba4af7020c -s ours am: f6c4022554 -s ours
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637

Change-Id: I68d06a70f2fe19be55e8dc4f02174d65987334a2
2020-06-20 03:52:11 +00:00
Automerger Merge Worker
75d056d361 Merge "Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f am: 3e89101ab2" into rvc-qpr-dev-plus-aosp am: 0776463298
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I77c4f3402bd1b04f5ed067c51e013542d3a732b2
2020-06-20 03:52:09 +00:00
Mark Chien
4d929f894c [automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda am: 3548a5eb0e -s ours am: f19ef641c8 -s ours
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536

Change-Id: I38dc3459053c92047a42b89a6e91f2ef9714102c
2020-06-20 03:51:52 +00:00
Akshay Thakker
c98a5242e3 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: b6c41df0f2 am: 19236d41c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Idf658fb679fdb487ff281314f89fac3a3a416b50
2020-06-20 03:51:50 +00:00
Akshay Thakker
a14e7f365e Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: 491faedab3 am: 7c08d1eeb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I6761fb2d312c5cbe5ae968b33fe692dde6e6cf5a
2020-06-20 03:51:29 +00:00
Automerger Merge Worker
0776463298 Merge "Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f am: 3e89101ab2" into rvc-qpr-dev-plus-aosp 2020-06-20 03:35:42 +00:00
Akshay Thakker
ebeb999612 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f am: 3e89101ab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Icd62da7e02b3d7db07932b82c95451287a54fc9c
2020-06-20 03:35:38 +00:00
Akshay Thakker
19236d41c4 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: b6c41df0f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Ia3bb738ba8614dfc300c78fde007f9d81cef865d
2020-06-20 03:35:37 +00:00
Akshay Thakker
7c08d1eeb5 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: 491faedab3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Iefc3d2724d16e3a2847c312a73404546922a63bf
2020-06-20 03:35:28 +00:00
Mark Chien
f6c4022554 [automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 am: ba4af7020c -s ours
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637

Change-Id: I1444a5e1d7854252bb9a1a392edc0e9c18d769e2
2020-06-20 03:29:30 +00:00
Mark Chien
f19ef641c8 [automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda am: 3548a5eb0e -s ours
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536

Change-Id: I869f09382784056c9a791fe7ff7296a3b9f9c941
2020-06-20 03:29:20 +00:00
Jason Chiu
7e8de263dc Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: cfe50a6f60 am: e40dec05e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Ie0fb605e4fc90f5b9fbed836caf29cfb5a672996
2020-06-20 03:29:14 +00:00
Jason Chiu
addb0fa60b Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 am: 442de5c4dd am: bbbcb7ae68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I02f5c155f5e383d2d4cf7d12bc31966565954a5a
2020-06-20 03:29:06 +00:00
Jason Chiu
7c28e2c1cf Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba am: 6f8d8e3d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I05297cf55d085fc8da614fda650e0e7ab08e11cf
2020-06-20 03:28:58 +00:00
Akshay Thakker
3e89101ab2 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Icf581e34aca42cb3d1df75066b5493c687e9c8d8
2020-06-20 03:22:39 +00:00
Akshay Thakker
b6c41df0f2 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I9e0194640b23d84e3745212bd11b05341cb229c7
2020-06-20 03:22:36 +00:00
Akshay Thakker
491faedab3 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I5b6f97cdbb0fadd3cc75a27040f2471377e01ef6
2020-06-20 03:22:22 +00:00
SongFerngWang
36796a1616 NetworkModePreference's list needs to allow values set from overlay.
Root cause: ag/10614943 removed the resources, so each of item
values is hard coded. This broke the overlay. This CL adds the
resource back so the overlay can work.

Bug: 159301925
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)

Change-Id: Id5ad2fdd0a87586136e4a26d2e44cf5278df5d9d
2020-06-20 11:21:18 +08:00
Mark Chien
ba4af7020c Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637

Change-Id: I9dcb7ee1f1e2c0dfbaf14cf9636b0b153e636cb7
2020-06-20 03:17:33 +00:00
Mark Chien
3548a5eb0e Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536

Change-Id: If30d8e11f18380b3ab5f2ef840951d550532077a
2020-06-20 03:17:20 +00:00
Jason Chiu
e40dec05e2 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: cfe50a6f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Ifb537b8612bfeab7dea1bdaaf662d4eb67c89ebb
2020-06-20 03:17:10 +00:00
Jason Chiu
bbbcb7ae68 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 am: 442de5c4dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I935d38b45d14252a0a76e048df9e2d7cf339bc35
2020-06-20 03:16:57 +00:00
Jason Chiu
6f8d8e3d05 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I4236bdb397c583d278e5b9c7f3f2def1827ae5a3
2020-06-20 03:16:51 +00:00
Akshay Thakker
d6f41c192f Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I8e84d908df0edd77d13579ab95e7aedf3d370d04
2020-06-20 03:10:39 +00:00
Akshay Thakker
efbdb099fd Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I00d9c3ce6b3213de8dd04de38da7e60737c5d5fd
2020-06-20 03:10:27 +00:00
Mark Chien
4064368496 Merge "Replace ConnectivityManager as TetheringManager" 2020-06-20 03:08:37 +00:00
Mark Chien
9f1fe57bda Merge "Remove schedule recheck logic from TetherService" 2020-06-20 03:08:14 +00:00
Jason Chiu
442de5c4dd Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I2c9b54011db4a9269f2cb01539ab5a793783c482
2020-06-20 03:04:39 +00:00
Jason Chiu
4a48011fba Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Iad6aac126e058bc6293d0587debb345506e7b643
2020-06-20 03:04:27 +00:00
Jason Chiu
cfe50a6f60 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: If672ca9668dd95afba4b8d859a7fad2389a45c13
2020-06-20 03:04:24 +00:00