Automerger Merge Worker
7bb65a19dc
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6
...
Change-Id: I380cb41a50e1dfc1edf9aca30c6dac14e33740d5
2020-03-13 12:24:48 +00:00
Automerger Merge Worker
fa889d4fec
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06
...
Change-Id: I7a64297cc60f20d560e811636c4d2678366282c1
2020-03-13 12:24:42 +00:00
Bonian Chen
52dd9f5abf
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController"
2020-03-13 12:05:36 +00:00
Bonian Chen
0972a6dd94
Merge "[Settings] Refactor DisabledSubscriptionController"
2020-03-13 11:52:53 +00:00
Automerger Merge Worker
e628466fc2
Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98
...
Change-Id: I449647f069d2e356fd6fa7ed06e655e2c0ad9eb9
2020-03-13 10:48:10 +00:00
Automerger Merge Worker
0587fe1ced
Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c
...
Change-Id: I9f0f6f0f404b35f05ac1b101b7a3e71bae6517c0
2020-03-13 10:48:05 +00:00
Bonian Chen
985352d172
Merge "[Settings] Refactor CarrierPreferenceController"
2020-03-13 10:12:29 +00:00
Bonian Chen
1b00c00f79
Merge "[Settings] Refactor Telephony PreferenceController"
2020-03-13 10:11:54 +00:00
Automerger Merge Worker
793fa69cf8
Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a
...
Change-Id: Ibd1693cfa19efadf1cba11180464cb199248780f
2020-03-13 09:39:00 +00:00
Bonian Chen
1f1843f11c
Merge "[Settings] Refactor MmsMessagePreferenceController"
2020-03-13 09:08:18 +00:00
Bonian Chen
0971feaeda
[Settings] Code Refactor of MobileNetworkPreferenceController
...
Code Refactor of MobileNetworkPreferenceController
Bug: 150567855
Test: make
Change-Id: If5de2d0841e2f8705d2e202b6e6a7e53dc1a4897
2020-03-13 15:58:09 +08:00
Automerger Merge Worker
4ce01a847c
Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298
...
Change-Id: Ie775c149cc731bb606f6dcb86a75512855f4e150
2020-03-12 16:57:39 +00:00
Automerger Merge Worker
654b19e1d5
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5
...
Change-Id: I151894dc8de726b437ba6715ea783483ac9602fb
2020-03-12 16:57:33 +00:00
Bonian Chen
ac2c706809
Merge "[Settings] Fix behavior of mobile data plan"
2020-03-12 16:19:57 +00:00
Bonian Chen
0f15f98999
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController"
2020-03-12 16:19:18 +00:00
Bonian Chen
0a00f0c44c
[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController
...
use TelephonyManager's setDefaultVoiceSubscriptionId instead of setDefaultVoiceSubId
Bug: 150352656
Test: make
Change-Id: I61078c72c9a5374d4840869ecf9b65d4ce8ef85c
2020-03-12 20:57:09 +08:00
Bonian Chen
332de69f8e
[Settings] Refactor CarrierPreferenceController
...
Refactor CarrierPreferenceController
Bug: 150352656
Test: make
Change-Id: I8b125eb501cdbf63cbfa84d72d78e44a655bf9a5
2020-03-12 20:53:10 +08:00
Bonian Chen
99c0f3fe14
[Settings] Refactor MmsMessagePreferenceController
...
Refactor MmsMessagePreferenceController
Bug: 150352656
Test: make
Change-Id: Id72f8f95eb12bb5c8f060df6c247312c56f2e69a
2020-03-12 20:50:25 +08:00
Bonian Chen
b7891e879f
[Settings] Refactor Telephony PreferenceController
...
Refactor TelephonyBasePreferenceController and TelephonyTogglePreferenceController
Bug: 150352656
Test: make
Change-Id: I3d52054fd9fbc5597db6266686d155a12d5a88d6
2020-03-12 20:43:54 +08:00
Bonian Chen
29c1be284b
[Settings] Refactor DisabledSubscriptionController
...
Refactor DisabledSubscriptionController
Bug: 150352656
Test: make
Change-Id: I6d31247d77c8fb515b9ba1b1ead33102f0e9e12f
2020-03-12 20:17:17 +08:00
Automerger Merge Worker
31f9002e3b
Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9
...
Change-Id: I16b8f6d6e48c7f1f8f6ef6e76b6eaf73269b2da0
2020-03-12 11:31:43 +00:00
Automerger Merge Worker
97bb8e9d34
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883
...
Change-Id: If93befb35d7f8a6828568c977a75532332a71c93
2020-03-12 11:31:37 +00:00
Bonian Chen
a7a9863a52
Merge "[Settings] Code refactor"
2020-03-12 11:08:01 +00:00
Bonian Chen
bfc8714e1f
[Settings] Code refactor
...
Code refactor.
Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
2020-03-12 16:31:06 +08:00
Bonian Chen
35904059d0
[Settings] Fix behavior of mobile data plan
...
Fix UI issue.
Bug: 150352656
Test: make
Change-Id: If5c6fc3c07259c45eba4d0f1f76b7b6de20cc6f4
2020-03-12 16:26:51 +08:00
Bonian Chen
a9d89cfd60
[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION
...
Add flag for startActivity() with URI.
Bug: 150352656
Test: make
Change-Id: I7292f3802e22a73dc61cbbb5551c12ca05261629
2020-03-12 16:14:00 +08:00
Automerger Merge Worker
0fae3591e4
Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b
...
Change-Id: Ibb8fba2dfeca99e2c5db00039e5af926fef7ff56
2020-03-08 05:26:17 +00:00
SongFerngWang
000ddb3194
PreferredNetworkModePreferenceController's summary no 5G item
...
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
Merged-In: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
2020-03-06 11:37:58 +08:00
Automerger Merge Worker
1a3755c443
Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e
...
Change-Id: Ic9fbef9eb26c6ae7830e94f6b81e543ff853afec
2020-02-27 09:12:37 +00:00
Automerger Merge Worker
9ac493094e
Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828
...
Change-Id: I20438b787bb2424cc4455c476e5f6bd95d559d87
2020-02-27 09:02:56 +00:00
Lee Chou
80d8c3bc83
Fixes ApnEditor not restoring previous UI
...
ApnEditor tries read and set the UI in onCreate, before the previous
bundle is restored. This caused problems when the configuration has
changed (such as switching to Dark Theme).
This moves the UI changes to onViewRestored
Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
Merged-In: I8147ec96569fa28867c088d6c36584aa344f40ed
2020-02-27 12:33:16 +08:00
Automerger Merge Worker
f2748437b8
Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a
...
Change-Id: I7ee6383097ed4a3e8b33769da09ca0a8334d08a1
2020-02-24 21:36:33 +00:00
Automerger Merge Worker
840506e88a
Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
...
Change-Id: Ifa566bf809360db17a6932ee5ebaede2eb63e1b3
2020-02-24 21:15:28 +00:00
Xiangyu/Malcolm Chen
aaee4539c7
Merge "Catch crash in mobile network ProgressDialog"
2020-02-24 21:07:17 +00:00
Automerger Merge Worker
9a49dd2bc4
Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee am: 63da73532d
...
Change-Id: I7b32dea30b97fc1389054eb93b9dc160a1c88d3c
2020-02-21 22:41:37 +00:00
Automerger Merge Worker
63da73532d
Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee
...
Change-Id: I16b31595e00e501c6c097ef3e4ad78f3fb0f9b75
2020-02-21 22:23:21 +00:00
Daniel Hunt
9f74807e89
Catch crash in mobile network ProgressDialog
...
When enabling "Automatically select network" in "Settings -> Network &
internet -> Mobile network -> Advanced" and rotating the device while
the dialog is showing there will be an IllegalArgumentException since
the decorView isn't attached to the window when dismissing the dialog.
Fixed by simply catching the exception since the dialog will be gone
anyway.
Bug: 146057372
Test: manual (see comment above)
Change-Id: I15f1d6f505fdf33964ce973ece31d6aa0d8f3909
2020-02-21 10:47:12 +00:00
Sarah Chin
51617e3ceb
Rename references to getLteOnCdmaMode
...
Use @SystemApi TelephonyManager#isGlobalModeEnabled()
Test: build
Bug: 147335742
Change-Id: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
Merged-In: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
2020-02-20 16:43:13 -08:00
Betty Chang
56235e44c5
Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c am: 74d5ae043c
...
Change-Id: Ief23331634bdccae49104db98193d0d842a7c99c
2020-02-17 07:01:23 +00:00
Betty Chang
74d5ae043c
Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c
...
Change-Id: Iaec059c5f4bc8cef5dd4a6b77205bdd633782ed3
2020-02-17 06:46:24 +00:00
changbetty
1a5351c433
[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice
...
- getDefaultDataSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultDataSubscriptionId());
- getDefaultSmsSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultSmsSubscriptionId());
- getDefaultVoiceSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId());
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
Merged-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
2020-02-15 14:56:58 +08:00
Zoey Chen
3f23659639
Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01efe am: 7b8e8255cd
...
Change-Id: I29a8aee4d2c6ac45e3827555455f74c47589ca17
2020-02-14 07:11:47 +00:00
Zoey Chen
7b8e8255cd
Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01efe
...
Change-Id: I951346d955f2223fce1b4c88e72cd44a5e33e1a5
2020-02-14 07:01:49 +00:00
Automerger Merge Worker
b29e64ace1
Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969
...
Change-Id: Ib2e8c6b3249a1137559fa9259348dcf26b7d8a0e
2020-02-07 12:54:50 +00:00
zoey chen
9d49a395c3
[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager
...
Bug: 145788881
Test: make
Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
2020-02-07 14:31:08 +08:00
SongFerngWang
b5dcd35969
Bug:PreferredNetworkModePreferenceController.java not being refreshed
...
Bug: 146594872
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
Change-Id: Ic3579e630c1d9422d7105a2d8fb619409a5823d6
Merged-In: Ib5cc06cdbfd2fa70cd115d70337b21500e362da6
2020-02-06 17:11:48 +08:00
Automerger Merge Worker
eafda3c724
Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f
...
Change-Id: I9a488c3d7b6452b64d1cb8b532d0f66f25017773
2020-02-04 10:51:31 +00:00
Bonian Chen
91638e079f
Merge "[Settings] Avoid rename inactive subscription from NullPointerException"
2020-02-04 10:43:01 +00:00
Bonian Chen
ab459dc194
[Settings] Avoid rename inactive subscription from NullPointerException
...
1. Init instance before accessing it
2. Re-enable test case
Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I2375043f16b5a25372af5c9f413fb8384850316c
Merged-In: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
2020-02-04 11:43:37 +08:00
Automerger Merge Worker
30d7fd79c9
Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a
...
Change-Id: I222f5d247438e1a64c0c33123555b97c1b3c5dfd
2020-02-04 02:55:31 +00:00