Commit Graph

71334 Commits

Author SHA1 Message Date
Mark Chien
e2387ee6b7 Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 969648b937 am: 9c693c35f8 am: 6f4a0c0fa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823

Change-Id: I1f4387a7e44b4073b59cab254d4c515c761743ac
2020-06-15 07:21:05 +00:00
Automerger Merge Worker
b312f2af4b Merge "Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 52a3551a7a" into rvc-d1-dev-plus-aosp am: ac3266b1be" into rvc-qpr-dev-plus-aosp am: 8152e9d40f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823

Change-Id: I145def075a545a397ce7e631175a5f4e9ada9330
2020-06-15 07:20:58 +00:00
Mark Chien
f169f3b6dd Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: ccdefc1ea5 am: 265eae9789 am: b5ffe7b058
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: I827a6b11195a214c341290636fef629c63f5be14
2020-06-15 07:20:45 +00:00
Automerger Merge Worker
a9f913cdac Merge "Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: ccdefc1ea5" into rvc-d1-dev-plus-aosp am: 76fbbb8152 am: bd2f5fa97a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: Iaba02c3946266714ec7d9556a14cd7c26c78844a
2020-06-15 07:20:38 +00:00
Mark Chien
75b2a75ccd Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: 10ef08d80f am: 78b4bc6020 am: 1912ee3e9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: I78a0a2d461fd96f2af1850c74d78cd34060e66cc
2020-06-15 07:20:22 +00:00
Mark Chien
6f4a0c0fa6 Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 969648b937 am: 9c693c35f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823

Change-Id: I525e37f3d06e6f59d1c2ead7383b4a25279e7ecb
2020-06-15 07:10:07 +00:00
Automerger Merge Worker
8152e9d40f Merge "Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 52a3551a7a" into rvc-d1-dev-plus-aosp am: ac3266b1be" into rvc-qpr-dev-plus-aosp 2020-06-15 07:10:05 +00:00
Automerger Merge Worker
39d588f803 Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 52a3551a7a" into rvc-d1-dev-plus-aosp am: ac3266b1be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823

Change-Id: Ic2efb21c2877dfc7f8f71a5ad9fb100e512a3bba
2020-06-15 07:10:01 +00:00
Mark Chien
b5ffe7b058 Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: ccdefc1ea5 am: 265eae9789
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: I2a9711237836a9e1e9ae03787d3bb36b9ffe230a
2020-06-15 07:09:59 +00:00
Automerger Merge Worker
bd2f5fa97a Merge "Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: ccdefc1ea5" into rvc-d1-dev-plus-aosp am: 76fbbb8152
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: If3ca5806e11f684c2e6e4d4b32eb879801412bd8
2020-06-15 07:09:52 +00:00
Mark Chien
1912ee3e9a Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: 10ef08d80f am: 78b4bc6020
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: If3f98ec817a3b4e9880e1a4e1e2a788395d1ad6c
2020-06-15 07:09:42 +00:00
TreeHugger Robot
9b534412a7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: c7f5577653 -s ours am: 372a107c7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80991660735bbc47e17f56cbe9ede12162b9c53d
2020-06-15 06:58:10 +00:00
TreeHugger Robot
893949d6f7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: 9c8a411aaf -s ours am: 539bf774ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iedfdb3afc7b86f7954dd1f928b65ae87f9d9ec94
2020-06-15 06:57:04 +00:00
TreeHugger Robot
ea1f1c364e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 4ee27b4813 -s ours am: 32a8567521 -s ours am: ae898c5924 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77cac1a73a635d305b69153b06137d35fd9f6b76
2020-06-15 06:55:57 +00:00
Automerger Merge Worker
ac3266b1be Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 52a3551a7a" into rvc-d1-dev-plus-aosp 2020-06-15 06:55:27 +00:00
Automerger Merge Worker
76fbbb8152 Merge "Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: ccdefc1ea5" into rvc-d1-dev-plus-aosp 2020-06-15 06:55:25 +00:00
Mark Chien
77fb97f1dc Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 52a3551a7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823

Change-Id: I7042245d05b956b28cb08aced653afaf845e77b2
2020-06-15 06:55:23 +00:00
Mark Chien
9c693c35f8 Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 969648b937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823

Change-Id: I19408b2633736eca9836e856bf0f9a49db461e05
2020-06-15 06:55:19 +00:00
Mark Chien
78b4bc6020 Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: 10ef08d80f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: I38b762a4ad65059c737b962e87944b5f99ffc377
2020-06-15 06:55:17 +00:00
Mark Chien
92bbd9e03b Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: ccdefc1ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: Ib7a8eee3925fb92d705b234945718b3117fc33d9
2020-06-15 06:55:17 +00:00
Mark Chien
265eae9789 Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: ccdefc1ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: Ie2e3d99c5963c0b701f050f122692cbb2ed92f92
2020-06-15 06:55:04 +00:00
TreeHugger Robot
372a107c7a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: c7f5577653 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c8a803f5c4f802e714797a31752f6c58be36cf8
2020-06-15 06:42:07 +00:00
TreeHugger Robot
539bf774ad [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: 9c8a411aaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44407330d410b690ec29fefcad7b1d401946d9ad
2020-06-15 06:41:24 +00:00
TreeHugger Robot
ae898c5924 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 4ee27b4813 -s ours am: 32a8567521 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b2457e62a080a91822620ffcae9b9b38b138517
2020-06-15 06:40:57 +00:00
Mark Chien
969648b937 Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823

Change-Id: Ideb30fac609a33accdf40e949b63cc53ba05dfd3
2020-06-15 06:40:11 +00:00
Mark Chien
52a3551a7a Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823

Change-Id: I50a9ff0710db37ae8513afbf876b3e7ca83fa787
2020-06-15 06:40:10 +00:00
Mark Chien
10ef08d80f Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: I4e08cfb19cf7600ed8bdd42675152e518446e541
2020-06-15 06:39:59 +00:00
Mark Chien
ccdefc1ea5 Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: I8800bc4ae09b3ce8d318a81dbeee9afe17e57b8f
2020-06-15 06:39:57 +00:00
Mark Chien
2aa2b0a2f8 Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev 2020-06-15 06:23:28 +00:00
Mark Chien
49b74e24d6 Merge "Remove schedule recheck logic from TetherService" into rvc-dev 2020-06-15 06:23:11 +00:00
TreeHugger Robot
c7f5577653 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17b8352e4aa0a8654da55e33cd0f812760d1ec7a
2020-06-15 06:18:28 +00:00
TreeHugger Robot
32a8567521 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 4ee27b4813 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f868011bcb3ff3bac9680be3f12b88e6115ccde
2020-06-15 06:18:22 +00:00
TreeHugger Robot
9c8a411aaf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib339d96c3ca23fe77255166e99ca8ebb5a25ebae
2020-06-15 06:18:11 +00:00
TreeHugger Robot
4ee27b4813 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied987a5fa2dd11c2e7a0188a9efcceb8a7f4d2a6
2020-06-15 06:07:33 +00:00
TreeHugger Robot
3be94f3a54 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc77ebd01ad7d0eb7f1813a26b88b35b2cb017ee
2020-06-15 06:06:35 +00:00
TreeHugger Robot
9ebeb21c36 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-15 05:49:54 +00:00
SongFerng Wang
e406cb7ffb Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: 58d36c2d48 am: fcd0677370 am: 859d08c7d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I6c81b7744bc55e6f1e4ac0350c15f6036c7dac12
2020-06-15 03:45:31 +00:00
Automerger Merge Worker
30b251d7e4 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea" into rvc-d1-dev-plus-aosp am: 348ff2c535 am: ed1c8128b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: Id9ad1392f66b1efffddb0cb0bcd1152b42303d55
2020-06-15 03:45:08 +00:00
SongFerng Wang
3fe393138f Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: 24d6bb3ed0 am: d554356135
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Iadae0648c7ed118de8fe398450a4dd60c879561f
2020-06-15 03:44:59 +00:00
Automerger Merge Worker
3a6566f80f Merge "Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp am: f9cf45fa07" into rvc-qpr-dev-plus-aosp am: b9dfbcddd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I0cee878336f86c7d491869374b8c1015d4f27641
2020-06-15 03:44:35 +00:00
SongFerng Wang
832a6e54af Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: c2f0ab12d8 am: 86aa01ea4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Iefd7c8b53d1b57ecaafde5d9c4756d4f5338cfd4
2020-06-15 03:44:07 +00:00
Yanting Yang
3fc7639cee Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa am: c75c3ce3b3 am: be4dbdbea4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: Id7f84e04a85a1c00c5fd172d451d140769008b8c
2020-06-15 03:43:43 +00:00
Automerger Merge Worker
051fcd443b Merge "[automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: d452bfdfdc -s ours am: c051e4830c -s ours" into rvc-qpr-dev-plus-aosp am: 09aa46b15d -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

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

Change-Id: I35f95d6d419ec53dc487e5ad9453960cfbbabe85
2020-06-15 03:43:30 +00:00
TreeHugger Robot
7ea97de70c [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: b35f7f2cc1 -s ours am: 8cfd34c9a0 -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

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

Change-Id: Idf6bea10837f8b8df00d73554707458a74dfcbbb
2020-06-15 03:43:18 +00:00
TreeHugger Robot
c13014a050 [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: 9cc918849c am: ba8ec34b45 -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 81f9391105 is in history

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

Change-Id: I12cc026e84bc842112df7ba1a028dd811ae6ad84
2020-06-15 03:43:08 +00:00
SongFerng Wang
859d08c7d9 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: 58d36c2d48 am: fcd0677370
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I095cbb68d08941692161aa653c189c81eb9a957e
2020-06-15 03:32:42 +00:00
Automerger Merge Worker
ed1c8128b8 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea" into rvc-d1-dev-plus-aosp am: 348ff2c535
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I21a0e8816a91715ff5f45272d03f48d2c35aa243
2020-06-15 03:32:25 +00:00
SongFerng Wang
d554356135 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: 24d6bb3ed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I5778a175058243d78ef793c2476ed7ea5fc4efa9
2020-06-15 03:32:05 +00:00
Automerger Merge Worker
b9dfbcddd4 Merge "Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp am: f9cf45fa07" into rvc-qpr-dev-plus-aosp 2020-06-15 03:31:25 +00:00
Automerger Merge Worker
4b6242777a Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp am: f9cf45fa07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I77d24b536813650f11738e4c78c8fcd759b93f2a
2020-06-15 03:31:19 +00:00