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
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
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
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
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
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
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
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
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
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
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
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
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
Betty Chang
cc9aef705a
Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline"
2020-02-04 02:44:15 +00:00
Automerger Merge Worker
49cd1555f3
Merge "access system resources with android.R package" am: ef77c1d67f
...
Change-Id: I663f693f498e3566deb37f6175fc0bb214264118
2020-01-31 15:55:52 +00:00
Sooraj Sasindran
ef77c1d67f
Merge "access system resources with android.R package"
2020-01-29 17:34:53 +00:00
Sarah Chin
1edf46fc74
Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor"
...
am: 0c2cd2a94d
Change-Id: Ibce639f419d021ba6abe507381644eb3fd8249ef
2020-01-29 08:14:34 -08:00
Sarah Chin
0c2cd2a94d
Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor"
2020-01-29 15:56:09 +00:00
Sooraj Sasindran
a30bdaaaf8
access system resources with android.R package
...
Bug: 143289541
Test: make
Merged-In: Idc10955639bce7b8e579c50af78056389d44d492
Change-Id: Idc10955639bce7b8e579c50af78056389d44d492
2020-01-27 22:17:28 -08:00
Nathan Harold
993ed46715
[DO NOT MERGE] Update CellIdentityGsm Constructor
...
Add a dummy parameter to the CellIdentityGsm constructor
for backwards compatibility.
As this code doesn't exist in goog/master, add a shim but
don't merge it.
Bug: 135921133
Test: compilation
Change-Id: I707bb4d2b90bfecd5825c25f9a1f92dbd9ccf41b
2020-01-20 22:07:20 -08:00
TreeHugger Robot
db6915778e
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master
2020-01-16 18:29:15 +00:00
Bonian Chen
6f82fe83f0
Merge "Remove reference of PhoneConstant."
2020-01-16 09:17:01 +00:00
Xin Li
ccbee6a795
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
...
Bug: 146167222
Change-Id: I77344517b74a2192af49a3f8956d8756b81741d9
2020-01-15 15:57:20 -08:00
Bonian Chen
e9324b48ab
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
2020-01-15 14:56:36 +00:00
Bonian Chen
58ed9710c7
Remove reference of PhoneConstant.
...
Copy constants to ApnEditor from PhoneConstant
Test: make
Test: m RunSettingsRoboTests
Change-Id: Idb26ded937dd31f08c96323d5064947a6af86156
Merged-In: I22b85799ad547aca1ce4e63af3f39bc7f29618c6
2020-01-15 21:52:43 +08:00
Bonian Chen
8845af8a14
[Settings] Replacing accessing of PhoneConstants$DataState
...
1. Replaced by PhoneStateListner#onPreciseDataConnectionStateChanged().
2. Remove usage of hidden API SubscriptionManager#getPhoneId()
Bug: 147080692
Test: manual
Change-Id: I6e7c9910ed63e027fc02c1835853175745b31b66
2020-01-14 01:18:50 +08:00
changbetty
4bdbd135fb
[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline
...
Bug: 146309719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Change-Id: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
Merged-In: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
2020-01-10 17:15:09 +08:00
Automerger Merge Worker
46f5e64f94
Merge "Removed reference to RadioAccessFamily" am: b13a4ef322 am: d934d5eda2
...
Change-Id: I1b13f79040ba776e8a0c763280d4fc3f89e3f373
2020-01-09 02:26:28 +00:00
Treehugger Robot
b13a4ef322
Merge "Removed reference to RadioAccessFamily"
2020-01-09 02:09:10 +00:00
Lee Chou
373b43c16e
Removed reference to RadioAccessFamily
...
1. Removed reference to RadioAccessFamily#getNetworkTypeFromRaf,
RadioAccessFamily#getRafFromNetworkType
2. Migrated hidden NETWORK_MODE_* constants in TelephonyManager
Bug: 147079703
Test: build and test manually
Change-Id: I94745edc37d80336197f874cb7b4afd42dfc97a8
2020-01-08 19:13:47 +08:00