Commit Graph

886 Commits

Author SHA1 Message Date
Bonian Chen
696c9b7335 [Settings] Connected carrier should not be forbidden ones
Manual network selection UI tried to display connected carrier as
initial list prior to the initial response from network scan.
However, the detection of connected carrier could be incorrect.

Before having an architectural change for this part, adding a piece of
code to avoid from displaying carriers which should be avoided.

Bug: 165158590
Test: local
Change-Id: If9c0804c706dd77a1c690555b245425dfeaf1fa9
2021-06-01 22:48:17 +08:00
Bonian Chen
ca83d9e631 Merge "[Settings] Code refactor - NetworkSelectSettingsTest" 2021-05-31 13:45:07 +00:00
Bonian Chen
e96b889d5b [Settings] Code refactor - NetworkSelectSettingsTest
Move NetworkSelectSettingsTest.java from robolectric into JUnit.

Bug: 189742455
Test: local, JUnit
Change-Id: I72066cc04ea6bdc8f7c68351e649926350fe41c9
2021-05-31 11:14:17 +00:00
Peter Wang
b66e797567 Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev 2021-05-26 17:37:04 +00:00
Weng Su
9512d53697 Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev 2021-05-26 11:45:00 +00:00
Weng Su
a2084a63c6 [Provider model] Add "See all" text link to Internet Panel
- Add "See all" text link at the bottom of the network providers list
  - Don't show "See all" text link if the Wi-Fi network is empty

Bug: 188710392
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: If99c1e6597b4d2ef6a916fbdab3df9cfad8b464e
2021-05-26 11:44:09 +00:00
SongFerng Wang
3a55bed8a1 Merge "Add more log for NetworkProviderWorker" into sc-dev 2021-05-25 06:23:33 +00:00
SongFerngWang
9478be4fa7 Add more log for NetworkProviderWorker
Bug: 183594909
Test: build pass
Change-Id: I0b251df79c4db7e0b7eb5ab5338d43f238a3b50e
2021-05-25 08:57:52 +08:00
Jack Yu
3616520985 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev 2021-05-19 16:26:18 +00:00
SongFerngWang
d7969369de API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED
CAPABILITY_ALLOWED_NETWORK_TYPES_USED is renamed CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK
Bug: 182198501
Test: atest packages/apps/Settings/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
atest frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/RadioConfigResponseTest.java

Change-Id: Id9a27ad972ba7b27311e1b8c6b245f42b94fc7be
2021-05-17 17:20:54 +08:00
Peter Wang
5dff40c78f Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]
Bug: 131169645
Fix: 184769109
Test: Build
Change-Id: Ifbde65db0abc43d739fdd67822c19c3063df0d32
2021-05-12 16:25:31 -07:00
tom hsu
2519077d97 Show W+ when connected to Carrier Wi-Fi Network
Internet picker
  - https://screenshot.googleplex.com/7k4ojF65a8Bis5R
 Internet panel
  - https://hsv.googleplex.com/6749112168873984
Bug: 185431894
Test: atest passed

Change-Id: Ic79686b47f033870ad8e7741f9baf3230dde7b7c
2021-05-10 14:08:05 +08:00
Stanley Wang
2248941d43 Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev 2021-05-05 05:07:47 +00:00
Stanley Wang
81524c89cc Fix the "Video call" can be searched on unsupported device.
The non-indexable does not work due to the NPE.

Fixes: 186594185
Test: robo test and see the search result.
Change-Id: Idc733b3521a774fa8b61a853aa078f50afc331cb
2021-05-05 11:32:10 +08:00
Amit Mahajan
e2de71a6a4 Merge "Get rid of redundant mSubId." into sc-dev 2021-05-04 20:11:56 +00:00
Jeremy Goldman
d6913243a1 Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev 2021-05-04 09:30:04 +00:00
Jeremy Goldman
050f7a7657 If the CarrierConfigManager is still null, return that the preference is
not available.

Test: atest -c VideoCallingPreferenceControllerTest
Bug: 186594185
Change-Id: I4650d9f77f6a4a0cb84d6e20f02e4ab1d1841131
2021-05-04 15:05:53 +08:00
Amit Mahajan
c58284d2b5 Get rid of redundant mSubId.
Test: none
Bug: 182326102
Change-Id: I0be2923ed28551aef57fb85f2914f7f8f40a12f9
2021-04-29 09:56:58 -07:00
Amit Mahajan
6402ac45e6 Merge "Fix incorrect logging." into sc-dev 2021-04-29 16:54:06 +00:00
Amit Mahajan
e22567d44e Fix incorrect logging.
Test: none
Bug: 182326102
Change-Id: Ibe9b4dd26eb92327d32dc3447c5a613c3fefa46e
2021-04-27 17:43:13 -07:00
Jeremy Goldman
f1ee6987e6 Merge "Combine 5G and recommended strings" into sc-dev 2021-04-27 07:41:45 +00:00
Yomna Nasser
7299387774 Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev 2021-04-22 16:00:02 +00:00
Yomna Nasser
e43f26294d Handle invalid subIds in Enable2gPreferenceController.
Implements improved handling of invalid subIds in the
"Allow 2G" controller + unit tests.

Bug: 185264531
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: I7587f1a2a8150bbc6cc0864c9a13d0d910a26682
2021-04-22 00:14:29 +00:00
Jeremy Goldman
def04b9cef Combine 5G and recommended strings
for RTL languages, the 5G string should actually go to the right of the
"(recommended)" string. Because concatenating these two strings is
difficult to control programatically, this change combines the two
strings into one so that translators can place each string in the
correct location accordingly.

Bug: 185245370
Screenshot: https://screenshot.googleplex.com/8tn6qdvK2iGzvUv (looks
identical to before in english)
Test: atest -c SettingsUnitTest

Change-Id: I3511306a76ba9a0e6d30b62a6c7eb79f991a0262
2021-04-20 14:30:39 +08:00
Weng Su
aeb6200bfe [Provider Model] Carrie Wi-Fi offload toggle request
- Remove the Advanced expandable list pattern and expose the items

- Add Carrie Wi-Fi offload toggle preference

- Add Carrier Wi-Fi network preference

- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

- Screenshot:
  https://screenshot.googleplex.com/8vMow53cvGfUAoj

Bug: 182324921
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         MobileDataPreferenceControllerTest \
	 WifiPickerTrackerHelperTest

Change-Id: I5a7f4cc6850fe76c0efee392c0c0c23cb41f5e1e
2021-04-20 07:58:20 +08:00
SongFerng Wang
c7d2169120 Merge "The Network Select shows wrong operator name" into sc-dev 2021-04-12 02:45:52 +00:00
SongFerngWang
5c2b140483 The Network Select shows wrong operator name
It get the empty subscriptionInfoList from
 SubscriptionManager#getAccessibleSubscriptionInfoList, so the UI
 shows default subId's operator.
 Since this item appears, when sim is active, using
 getActiveSubscriptionInfoList is enough.

 - https://screenshot.googleplex.com/9aHtDVpnYQBsiQr

Bug: 182020952
Test: atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest

Change-Id: I0d86ec41236a0d1be657ccd57fd0cf90f96b8b89
2021-04-09 12:07:00 +00:00
Bonian Chen
998554d68f [Settings] More log to help analysis
Add log for supporting issue analysis.

Bug: 184602966
Test: local
Change-Id: I739ac827e0da1caca045e88599fafb293e25b65c
2021-04-07 16:12:38 +00:00
Weng Su
4e341b780a Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev 2021-03-30 11:32:57 +00:00
Bonian Chen
fecfb7f5e4 Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev 2021-03-30 05:31:52 +00:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)"
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
2021-03-30 00:51:15 +00:00
Weng Su
439cc64b1c [Provider Model] Move the Internet unavailable Wi-Fi down
- Check the Wifi network have both INTERNET and VALIDATED capabilities
to achieve effective network access

- Move the Internet unavailable Wi-Fi down to the top of Wi-Fi list

- Don't paint color for the Internet unavailable Wi-Fi

- Screenshot:
  https://screenshot.googleplex.com/w82kbALssdTZmg4

Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test on device
atest -c InternetUpdaterTest \
         NetworkProviderWorkerTest \
         ProviderModelSliceTest

Change-Id: Idf04e556ab5a87abc5bc96d1934f5e8fd91fbfaa
2021-03-26 23:24:14 +08:00
SongFerngWang
b471e2c38c Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem
To new the OperatorInfo with the AccessNetworkType parameter.

Bug: 179636444
Bug: 182336960
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=NetworkSelectSettingsTest
Change-Id: If78fde9a22e91ee8b77e2063762166b2137ebbc1
2021-03-24 20:46:04 +08:00
Bonian Chen
d5ccde31a8 [Settings] Support getSystemService(Class<T>)
Add getSystemService(Class<T>) to align the capability with framework
part.

This is a back port from aosp/1639943, aosp/1645152 and aosp/1648047

Bug: 179640862
Test: local
Change-Id: I035db55a71f94000ca35f8d71f03c19208423c73
2021-03-24 00:59:46 +08:00
SongFerng Wang
993b820a76 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev 2021-03-19 01:28:31 +00:00
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:09:29 +00:00
SongFerngWang
1dcc788177 KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray
Bug: 179814490
Test: build pass
Change-Id: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
2021-03-17 23:18:33 +08:00
TreeHugger Robot
c7d3c5f1be Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev 2021-03-17 10:30:48 +00:00
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
TreeHugger Robot
8d73578b5f Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev 2021-03-12 12:32:38 +00:00
Zoey Chen
b8a639f8fd [Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen
Bug: 175270951
Test: make and atest
Change-Id: I15e1a199e6a34914db97055bfea9392c5bbdc9c6
2021-03-12 19:27:05 +08:00
Zoey Chen
dc1ec2d092 [Provider Model] Show Off if WFC is disabled by user
Bug: 182232693
Test: make and atest
Change-Id: I0ef0a09adb1c9636ec14e0ab71116fd2834f1f97
2021-03-12 15:30:07 +08:00
Sooraj Sasindran
1ce8eb765a update isCrossSimCallingEnabledByUser name
update isCrossSimCallingEnabledByUser name to
isCrossSimCallingEnabled

Bug: 179143945
Test: build
Change-Id: I8bb0196cc04dc437ed709548ecd569c4dd7828a1
2021-03-10 16:43:49 -08:00
Yomna Nasser
b6042cec85 Merge "Add metrics to Enable2gPreferenceController." into sc-dev 2021-03-05 22:26:49 +00:00
Zoey Chen
d841a36c6f Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev 2021-03-05 14:43:52 +00:00
Zoey Chen
bf1857e4a5 [Telephony] Use TelephonyCallback instead of PhoneStateListener part5
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
Merged-In: I52af54045872bbf13e64d5d94c8b027ec702abb9
2021-03-05 11:46:46 +08:00
Yomna Nasser
6adc5ab334 Add metrics to Enable2gPreferenceController.
Test: m & atest -c Enable2gPreferenceControllerTest & statsd_testdrive 97
Bug: b/181699391
Change-Id: I1ad860937cec7594c482706cadd853b115436594
2021-03-05 01:18:40 +00:00
Calvin Pan
41a7293038 Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev 2021-03-04 11:33:47 +00:00
SongFerngWang
fc435e3736 Replace allowedNetworkTypes with allowedNetworkTypesForReason
- Replace getAllowedNetworkTypes with
getallowedNetworkTypesForReason(ALLOWED_NETWORK_TYPES_REASON_CARRIER)
- Replace "Settings.Global.PREFERRED_NETWORK_MODE" with
"getAllowedNetworkTypesForReason(USER)"
- Move EnabledNetworkModePreferenceControllerTest from robotests to unit
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT
- Rename PreferredNetworkModeContentObserver to AllowedNetworkTypesListener
Bug: 161434786
Test: build pass.
(PASS)atest CdmaSystemSelectPreferenceControllerTest
(PASS)atest PreferredNetworkModePreferenceControllerTest
(PASS)atest AllowedNetworkTypesListenerTest
(PASS)atest EnabledNetworkModePreferenceControllerTest
(PASS)atest MobileNetworkUtilsTest

Change-Id: I2b981569ad11cf70a558c1952cc2e077464328d8
Merged-In: I2b981569ad11cf70a558c1952cc2e077464328d8
2021-03-04 19:20:04 +08:00
SongFerngWang
766f78e8ed Use SubscriptionManager.getResourcesForSubId to get Resources
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.

Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest

Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
Merged-In: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
2021-03-04 09:41:31 +00:00