Commit Graph

68840 Commits

Author SHA1 Message Date
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
tim peng
b6b9944e14 Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6 am: b4d7fe8d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419

Change-Id: I4f3db3bb0215703e3e016daad7d2e2998dd36a6a
2020-06-15 06:55:37 +00:00
Automerger Merge Worker
d1798a413c Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8 am: 969648b937" into rvc-d1-dev-plus-aosp 2020-06-15 06:55:35 +00:00
Mark Chien
806a7b48c3 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: I61799d6f67f634ef465c174edb0aed465a92ff81
2020-06-15 06:55:31 +00:00
tim peng
1ed3d7c6b5 Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6 am: ae2c0de1b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419

Change-Id: I1fadfd59a30cd5392fd2eacc2433ff14431240e3
2020-06-15 06:55:29 +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
tim peng
2d7f7fbbb6 Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6 am: b4d7fe8d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419

Change-Id: I8ff99cad7b8de1fc020e8de682e06aa622535914
2020-06-15 06:55:24 +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
tim peng
b4d7fe8d6b Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419

Change-Id: I98ea63c8fce726891bd60918be64ead454b13f52
2020-06-15 06:40:19 +00:00
tim peng
ae2c0de1b2 Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419

Change-Id: I74458ef63a9c25252efdbd16f0fbe7fd73b65baf
2020-06-15 06:40:19 +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
tim peng
e5c9b113b6 Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev 2020-06-15 06:29:32 +00:00
Tim Peng
e3a821d6fe Unable to adjust remote session volume in Sound Setting
-It is incorrect to compare the device ID with session ID
-The preference key is the session ID and we should adjust remote session volume by it

Fix: 158956140
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia815b7bfdf6d7e44aca9832f11371669e973d363
2020-06-15 06:27:49 +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
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
SongFerng Wang
86aa01ea4f Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: c2f0ab12d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

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

Change-Id: Id210b618f8febff7f3be3dc85681adfde580087a
2020-06-15 03:30:59 +00:00
Automerger Merge Worker
09aa46b15d 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 2020-06-15 03:30:56 +00:00
TreeHugger Robot
8e65985448 [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: d452bfdfdc -s ours am: c051e4830c -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: I393d5a20a8f927b0c333d68dfa780948e48a98a6
2020-06-15 03:30:52 +00:00
TreeHugger Robot
8cfd34c9a0 [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: b35f7f2cc1 -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: I85e26bdb213648bc5b99399dd3bf969b2606535e
2020-06-15 03:30:47 +00:00
TreeHugger Robot
ba8ec34b45 Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: 9cc918849c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

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

Change-Id: Ic51904ec93d5ed3417bb81b3d67c8f7b1ddb1dab
2020-06-15 03:18:55 +00:00
Automerger Merge Worker
348ff2c535 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea" into rvc-d1-dev-plus-aosp 2020-06-15 03:18:50 +00:00