Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,031 Commits 1 Branch 0 Tags
91638e079fb2618d2a57c847fa4e908ed1057963
Commit Graph

549 Commits

Author SHA1 Message Date
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
Betty Chang
cc9aef705a Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" 2020-02-04 02:44:15 +00:00
Sooraj Sasindran
ef77c1d67f Merge "access system resources with android.R package" 2020-01-29 17:34:53 +00: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
Bonian Chen
6f82fe83f0 Merge "Remove reference of PhoneConstant." 2020-01-16 09:17:01 +00: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
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
Bonian Chen
cd4113ba5c Merge "[Settings] Remove access to getSimOperator() API" 2020-01-07 18:06:40 +00:00
Bonian Chen
1a3ed7a560 Merge "[Settings] Remove PhoneStateIntentReceiver" 2020-01-07 16:21:01 +00:00
Bonian Chen
7d31f16e0f [Settings] Remove access to getSimOperator() API 
Replace getSimOperator() by having SubscriptionInfo
from ProxySubscriptionManager#getActiveSubscriptionInfo().

Bug: 144263441
Test: Manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ApnEditorTest
Change-Id: I132b352dfb50a9cd3a2ddd21b347177ac0332740
Merged-In: I25cc9dc0912564b8d6f8b23b53f3eb20a51eea32
 2020-01-07 12:44:30 +00:00
Bonian Chen
e520ec60aa [Settings] Remove PhoneStateIntentReceiver 
1. Replace PhoneStateIntentReceiver by adopting PhoneStateListener
2. Replace TelephonyProperties.in_ecm_mode() by
TelephonyManager.getEmergencyCallbackMode()

Bug: 144331663
Change-Id: Ib127cb165c65f50851c4390b05a16dfb8024fab1
Bug: 145830780
Test: Manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModeEnabler
Merged-In: Ib39ab1881484f65bc5a3834b2828c6ba98198cca
 2020-01-02 18:26:21 +08:00
Bonian Chen
b14af41430 [Settings] Correct spelling in source code 
Rename mSubsciptionsMonitor into mSubscriptionMonitor.

Test: build pass
Change-Id: Ib0444c61fbe4238f743bf83f6ff96656be433c9d
 2019-12-30 10:27:57 +08:00
Bonian Chen
b0bddfec15 Merge "[Settings] Replace getSimCount() API" 2019-12-27 02:45:42 +00:00
Zoey Chen
e8cf63ddd3 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 2019-12-26 13:44:58 +00:00
Bonian Chen
b373aeedfe [Settings] Replace getSimCount() API 
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().

Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Change-Id: If50c57e7c1b27f9a0baf2bd46cc0930e0a0be2bd
 2019-12-26 19:02:57 +08:00
zoey chen
fc3ddb2f16 [Settings] Replace #getServiceStateForSubscriber with #getServiceState 
Bug: 146821501
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
Merged-In: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
 2019-12-26 17:12:42 +08:00
Zoey Chen
171eabcb2d Merge "[Settings] Replace #getSimCount with #getActiveModemCount" 2019-12-26 03:44:47 +00:00
Bonian Chen
98e6ab358b Merge "[Settings] Replace TelephonyManager#from()" 2019-12-26 03:36:09 +00:00
zoey chen
5b336b1bd9 [Settings] Replace #getSimCount with #getActiveModemCount 
Bug: 146815553
Test: make
Change-Id: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
Merged-In: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
 2019-12-25 16:30:25 +08:00
changbetty
b7c8404317 [Mainline] Remove unused UiccController object 
Bug: 146842199
Test: make
Change-Id: I35f86ee24c0db2599924fb470537b860c9d08390
 2019-12-25 02:50:01 +00:00
Bonian Chen
67f7ab3f2b [Settings] Replace TelephonyManager#from() 
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EuiccPreferenceControllerTest
Change-Id: I8f6e8bc57c20782540f8b26bdeb163d881e70a2e
 2019-12-23 15:44:52 +08:00
Bonian Chen
661f006bb2 Merge "[Settings] Add owners to support network part" 2019-12-23 05:57:59 +00:00
Bonian Chen
a0b942a6f4 [Settings] Add owners to support network part 
Add more owners to support network part.

Bug: none
Test: none
Change-Id: I3fa0a72e75aace65887c461204fd9a33bd8fee13
Merged-In: Ic2820bc113bc26fc0d162c42c7925477177127ae
 2019-12-23 12:40:07 +08:00
Zoey Chen
990b0527aa Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" 2019-12-23 03:33:35 +00:00
Bonian Chen
228dd34a8a [Settings] Replace TelephonyManager#from() 
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaListPreferenceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSubscriptionPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSystemSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AutoSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=OpenNetworkSelectPagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSettingsTest
Change-Id: If78ad37d4795d615b6f8db2f5687a28792a6764f
 2019-12-23 01:00:38 +00:00
zoey chen
d7eb8113c7 [Settings] Remove usage of TelephonyManager getDefault() hidden API 
Bug: 146537234
Test: make
Change-Id: I818848b0ae323efe8b890cde9d9819d9a606f96d
Mergde-In: I818848b0ae323efe8b890cde9d9819d9a606f96d
 2019-12-19 19:45:59 +08:00
Bonian Chen
b2380eaaee Merge "[Settings] Create a proxy for SubscriptionManager" 2019-12-18 09:04:53 +00:00
SongFerng Wang
ecce39622d Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" 2019-12-18 01:36:08 +00:00
SongFerngWang
c13da87416 [mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech 
Bug: 146314969
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest

Change-Id: I1e9eeab9d886a2910c7db8b59cfe267c51c5920c
Merged-In: I1600a96a729fc3b555eab5bc80b069663c8eb00a
 2019-12-17 12:19:52 +00:00
Treehugger Robot
90544355cd Merge "[Settings] Remove access of TelecomManager.from()" 2019-12-16 13:04:24 +00:00
Bonian Chen
3a96d214d3 [Settings] Remove access of TelecomManager.from() 
Replace TelecomManager.from() into public API access.

Bug: 146187127
Test: build pass
Change-Id: Id9fa32063a9a7ea5b9107315e50330fa5eca41b7
 2019-12-16 08:48:05 +00:00
Bonian Chen
74c6ceed24 [Settings] Create a proxy for SubscriptionManager 
There're many access from Settings app to SubscriptionManager.
Lots of them are checking for similar information.
Create a proxy can reduce the number of inter-process access from
Settings app to SubscriptionManager, and improve Settings app's
UI performance.

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=GlobalSettingsChangeListenerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Change-Id: I3591c478045500a97245955767a7ddd5d361da77
 2019-12-16 16:26:40 +08:00
Bonian Chen
1247771b88 [Settings] Adopting public API 
Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by
SubscriptionManager#getActiveSubscriptionInfoList() since they're
equivalent.

Bug: 146312766
Test: build pass
Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc
 2019-12-16 06:35:43 +00:00
Bonian Chen
9d49e1b51f [Settings] Avoid access Controller from Slice 
AirplaneModePreferenceController is designed to be run in UI thread.
However, MobileDataSlice is designed to be run in SliceProvider.

Accessing AirplaneModePreferenceController within SliceProvider which
create a possibility of crash.

Bug: 145689275
Test: manual
Change-Id: Ic9eee407917a94c7247feb3afc709d4642cd9900
 2019-12-13 13:34:12 +08:00
Sarah Chin
4ff75ef786 Merge "Add NGRAN" 2019-12-05 21:37:37 +00:00
Sarah Chin
bf7ee4a861 Add NGRAN 
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
Merged-In: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
 2019-12-04 09:16:04 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources" 
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
 2019-11-28 07:26:07 -08:00
Torbjorn Eklund
4f44b44168 Consider subId when loading Wfc string resources 
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.

This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.

Bug: 129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
 2019-11-27 14:35:07 +01:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call" 
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
 2019-11-25 05:43:18 -08:00
Bonian Chen
cacf047daa [Settings] Fix conflict of AOSP merge on wifi call 
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
 2019-11-22 20:38:13 +00:00
Bonian Chen
821a1259e7 [Settings] Fix conflict of AOSP merge 
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c
Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
 2019-11-22 02:36:11 +00:00
Hunter Knepshield
418ef9973e Merge "Synced the code from master branch" 
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
 2019-11-15 10:45:58 -08:00
Sunny Shao
f3865e9264 Synced the code from master branch 
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
 2019-11-14 21:57:12 +08:00