Commit Graph

1719 Commits

Author SHA1 Message Date
Mark Chien
bb8f08013b Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: I3c59ccf36d2912c96ef9a2267ebf4742f4765e52
2020-06-17 02:47:31 +00:00
Mark Chien
5bd41e573b Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev 2020-06-17 02:29:35 +00:00
Bonian Chen
86fa9c6136 Merge "[Settings] Allow talkback to focus and select APN" into rvc-dev am: 97de75fa83 am: 7830e83c12 am: d27d6a98f6 am: 3aa20b3a4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802015

Change-Id: I01bbf8863c95f8289b153de925e4345b6773ff81
2020-06-15 09:00:10 +00:00
Bonian Chen
7830e83c12 Merge "[Settings] Allow talkback to focus and select APN" into rvc-dev am: 97de75fa83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802015

Change-Id: Ib197508a45c4b9ec9b022d1f35a5a889588c39d6
2020-06-15 08:14:11 +00:00
Bonian Chen
97de75fa83 Merge "[Settings] Allow talkback to focus and select APN" into rvc-dev 2020-06-15 07:51:17 +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
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
2aa2b0a2f8 Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev 2020-06-15 06:23:28 +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
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
SongFerng Wang
58d36c2d48 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: If6fbc2d5b6e82fedbb3f41ce7c11301491fd0c70
2020-06-15 03:12:27 +00:00
Bonian Chen
723c251c13 [Settings] Allow talkback to focus and select APN
Change the focus area to help talkback focus on APN items.

Bug: 149794675
Test: manual
Change-Id: I5f391be89a5b22095d6f0d04b187ea18970f18d4
2020-06-15 03:08:31 +00:00
SongFerng Wang
c3703cb4fe Revert "Mainline: removed legacy UI for network selection mode."
This reverts commit 521ebeafd3.

Reason for revert: to fix b/157880043

Bug: 157880043
Test: test legacy UI. PASS
Change-Id: I4116457a1f7fc0a3be142671c5d0439cd6bdf11d
2020-06-12 19:03:54 +08:00
markchien
17feecffae Replace ConnectivityManager as TetheringManager
Tethering APIs are all move to TetheringManager from Android R.
1. Replace ConnectivityManager tethering API usage as TetheringManager.
2. Use TetheringManager#stopTethering to disable usb tethering instead
of using deprecated ConnectivityService#setUsbTethering
3. Use TetheringManager#stopTethering to disable bluetooth tethering
instead of directly use BluetoothPan#setBlueoothTethering. So bluetooth
getProfileProxy is not needed in TetherService because tethering would
do that when calling #stopTethering.
4. Also support TETHERING_ETHERNET entitlement check that
TETHERING_ETHERNET is new added from Android R.

Bug: 146918263
Test: atest TetherServiceTest
Change-Id: Id969f29d7210f2ee32719c76439049bbc86cd4f6
2020-06-11 23:36:59 +08:00
markchien
92b09e825f Remove isProvisioningNeededButUnavailable usage
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only. TetherUtil#isProvisioningNeeded and
isProvisioningNeededButUnavailable are no longer needed because
tethering would ensure entitlement app is valid if entitlement check is
needed. Otherwise, tethering would return not supported that tethering
settings would be hidden.

Bug: 146918263
Test: m
Change-Id: If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c
2020-06-10 22:34:39 +08:00
TreeHugger Robot
399bc40250 Merge "Change SIM colors to follow GAR standards in dark mode in SIM rename dialog." 2020-06-02 17:02:24 +00:00
Bonian Chen
8dfb423714 Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf
Original change: undetermined

Change-Id: Ie0f273bc0e62b44c036ab49eaef1e1ec72f2de99
2020-06-02 14:57:45 +00:00
Bonian Chen
4191af1eb1 Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77
Original change: undetermined

Change-Id: I1e3964c6c35dad4c6092c8959b048e01a139e95d
2020-06-02 14:46:56 +00:00
Bonian Chen
68cc44bb77 Merge "[Settings] Move mobile data template out of framework" into rvc-dev 2020-06-02 14:36:20 +00:00
Bonian Chen
d40f7f707e [Settings] Move mobile data template out of framework
Move mobile data template out of framework

Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageLibTest
Change-Id: I5072cd1e673194d00b3ce82242bf5fbad88d23cd
2020-06-02 17:16:53 +08:00
SongFerng Wang
a8bdcaf0da Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 6bb9afede8
Original change: undetermined

Change-Id: I8ab56ae1365b0692de6a2ce73408fe431921b85d
2020-06-02 03:20:15 +00:00
SongFerng Wang
8b7fd29cda Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e
Original change: undetermined

Change-Id: Iff186c54542c52265798a66b6f153082fa10bcee
2020-06-02 03:07:09 +00:00
SongFerng Wang
893107fc60 Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"
This reverts commit 259e6288c9.

Reason for revert: Sooraj will implement another API for power manager.
Bug: 156709797
Change-Id: I15ee2799574cdf0318e593500f0dbfbf135d71f8
2020-06-01 06:25:13 +00:00
Paul Hu
cbebca9881 Merge "Forward the ResultReceiver to Tethering Entitlement app" am: 6045e9b90d
Change-Id: I614914b738e3af198fe21b881d2e475e2e8eda41
2020-05-29 21:26:52 +00:00
Paul Hu
6045e9b90d Merge "Forward the ResultReceiver to Tethering Entitlement app" 2020-05-29 11:54:20 +00:00
paulhu
a788a3190c Forward the ResultReceiver to Tethering Entitlement app
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
Merged-In: I37fcaddd5569223146ff9d6316d97f33312d8d24
2020-05-29 00:06:52 +08:00
Bonian Chen
8367dc4e03 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d
Change-Id: I42f4408e3030de899931be97cf9561797ccab725
2020-05-28 15:18:14 +00:00
Bonian Chen
42ba4a5fc7 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
Change-Id: I7ba14ae944d40e74038c3bdf8dd0a6cf44e5326b
2020-05-28 15:07:46 +00:00
Bonian Chen
e2da25108a Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev 2020-05-28 14:59:47 +00:00
SongFerngWang
b086e67289 EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8
Change-Id: Ic87925e1939f53d5428007a613138155ac57eeb2
2020-05-28 14:47:13 +00:00
SongFerngWang
6425a5e7c9 EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
Change-Id: I9a5fc5bc6ef5e04a8fad91051cc3aacbe9c7261f
2020-05-28 14:32:35 +00:00
SongFerngWang
259e6288c9 EnabledNetworkModePreferenceController Remove AllowedNetworkType
Power manager decision do enable/disable NR by AllowedNetworkType,
and it will effect the PreferredNetworkMode UI. The
PreferredNetworkMode list no 5G item when AllowedNetworkType
disabled.

Bug: 156709797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest  (pass)

Change-Id: I3ab9eca0956c4cce1b79e518942063b681eb96cd
2020-05-28 20:37:51 +08:00
Bonian Chen
ce0f3c66a0 [Settings] Avoid crash for VoIP account displayed as default voice
When displaying VoIP account in Default voice account UI within
mobile network configuration, some null pointer checking need to
applied due to this is no longer a real account bind to SIM card.

Bug: 157334667
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: I3927362676c867ac245f16e1d00ea953b21ec1d4
2020-05-28 18:17:42 +08:00
Bonian Chen
db253d31d8 Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
Change-Id: I06a1e5612384f99dea432ca90058269a661f4c4a
2020-05-27 08:18:32 +00:00
Treehugger Robot
6ea2228e31 Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
2020-05-27 01:52:00 +00:00
Brad Ebinger
525a07ec7f Fix NPE if CarrierConfigManager is not available
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-05-26 15:50:41 -07:00
Bonian Chen
b381ac0bad [Settings] Avoid SIM toggle switch loopback
API provided by SwitchBar widget would lead to callback when
SIM toggle switch operation failure and set UI back.
However, set UI back (rollback the UI) would lead to another
trigger to SIM toggle switch. This would generate endless
events and keep system budy.

To avoid from this callback, a check need to be done prior to UI
take action. Therefore, changing APIs to fit into this concept.

Bug: 155770954
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
Change-Id: Iaea1012acdbe449a882ced08b596c64b9f99256f
2020-05-26 21:34:39 +08:00
Paul Hu
7a56e81a5f Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev am: 37318d03a4
Change-Id: I901596b6b01cadc4d53f944da4db090e95b72b6d
2020-05-26 06:01:02 +00:00
Paul Hu
37318d03a4 Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev 2020-05-26 05:47:09 +00:00
paulhu
2efe482d95 Forward the ResultReceiver to Tethering Entitlement app
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
2020-05-21 02:33:15 +00:00
Jeff Tinker
a5f7479f5a Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
2020-05-20 19:50:57 +00:00
Jeff Tinker
9c657c34f4 Revert "[Settings] Remove mobile network v1"
This reverts commit daf6c9e85b.

Reason for revert: Broken build 6513883 on aosp-master on errorprone

Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
2020-05-20 19:14:57 +00:00
Bonian Chen
075a17c995 Merge "[Settings] Remove mobile network v1" am: 10799d12fd
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
2020-05-20 12:45:32 +00:00
Bonian Chen
daf6c9e85b [Settings] Remove mobile network v1
Cherry-pick of Ib365ba712af62729ca35abbc370aef087ce52a90

Fixes: 142920912
Test: rebuild, robolectric
Merged-In: Ib365ba712af62729ca35abbc370aef087ce52a90
Change-Id: I1554d475e0f34971381dcc42817573f98f958825
2020-05-20 07:49:33 +00:00
TreeHugger Robot
b5a3893f76 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209
Change-Id: Ib8f58a2e5930dfd4f3b8a25dcd0d02d4455a5b24
2020-05-20 06:43:42 +00:00
SongFerngWang
414f8b8fe6 Add corresponding code for the new NR condition
Bug: 155915216
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (Pass)

Change-Id: I171ea0a8adc621ad5e9dc5cd2090e431b923e775
2020-05-19 12:32:57 +00:00
Zoey Chen
6622ff7181 Merge "[Settings] Code refactor" am: f4d59078fb
Change-Id: I65a011ca26c574d53d7ae3c2551fe6aa44f9c861
2020-05-19 10:15:33 +00:00
Bonian Chen
e9911c28cf [Settings] Code refactor
Code refactor.

Bug: 141833767
Test: manual
Merged-In: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
Change-Id: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
2020-05-19 16:48:11 +08:00
Zoey Chen
2673571d28 Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca
Change-Id: I1d486a18f7b0a9b7eb79ac3d28ebbdc0cdfa88c9
2020-05-19 08:23:13 +00:00
Bonian Chen
cede995c5d [Settings] Code refactor for availability session
Code refactor for session design of availability status config.

Bug: 141833767
Test: manual
Merged-In: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
Change-Id: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
2020-05-19 11:41:59 +08:00