Commit Graph

8277 Commits

Author SHA1 Message Date
Jackal Guo
765fb8293d Revert "[Settings] Refactor PhoneStateListener"
This reverts commit e01df59027.

Reason for revert: b/163995409 | Build failure.

Change-Id: Ia413a4bae93055ceca5b6aa85602c84a8fbe5424
2020-08-13 08:48:31 +00:00
Bonian Chen
e01df59027 [Settings] Refactor PhoneStateListener
Remove Looper and update of mSubId

Bug: 144542981
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Merged-In: Ie6ae5b5914322644f2655e585b03a6b685bbc84a
Change-Id: I5306b3a80220c02d2de1b25f20e8ef7f845e9a09
2020-08-13 13:02:04 +08:00
Bonian Chen
5560882548 [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
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Merged-In: I965a0c07c7c9ef5897b33809bae6a7921977db18
Change-Id: I8010f74c41826b081aa9f599d33a9519a1888215
2020-08-13 10:56:55 +08:00
Fan Zhang
6c046831de Override 2 getSliceUri() instance to return platform slice
(This is not a clear cherry-pick, @Override need to be removed.)

Bug: 126222433
Test: robotest
Merged-In: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
Change-Id: Iec9fae48e91baef5861baef946fc155b1eb37904
2020-08-11 04:24:27 +00:00
Bonian Chen
5c4154b2e4 Merge "Add interface and extend db to support storing slice uris" 2020-08-11 02:23:56 +00:00
Fan Zhang
f609df425d Add interface and extend db to support storing slice uris
Bug: 126222433
Test: manual
Merged-In: Ie81e69477d297aa96a0daad02d56196c956271a3
Change-Id: Ifdae6fc47dc078ba83c211d07d6028f00f11e6f2
2020-08-10 16:50:21 +08:00
Josh Hou
abe032ea66 Show/hide 5G preferred network type also consider allowed_network_type
1. The carrier or privileged apps will enable/disable network types on
the device, so Settings references the allowed network type to show/hide
5G preferred network type option.

2. For mainline, copy the getNetworkTypeFromRaf() from RadioFamily to
Settings.

Bug: 136730709
Test: Manual test & EnabledNetworkModePreferenceControllerTest
1. Enable allowed_network_type
2. Disable allowed_network_type
Merged-In: I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5

Change-Id: Id591f454a60d0ba08c3fc4a2ffe40836dafeb5f0
2020-08-10 16:18:36 +08:00
Lee Chou
4fd08a2145 Replaced reference to setPreferredNetworkType
replaced with @SystemApi setPreferredNetworkTypeBitmask

Bug: 147405973
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest

Merged-In: I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b
Change-Id: Ia66cfc8fe109cfc038a8b53969bcd562727dbbc2
2020-08-07 14:59:38 +08:00
changbetty
f1a52da792 [Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DisabledSubscriptionControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SimSelectNotificationTest

Merged-In: If740c2d7ea2c1392d5fe538091ea6e5c4575ad26
Change-Id: Idca7a76c591448a45ecc33cb392f416c70d32f91
2020-08-06 09:14:58 +08:00
Bonian Chen
3e545f2bef Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" 2020-08-05 09:16:55 +00:00
changbetty
310eeebe5c [Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings
Bug: 147206736
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionUtilTest
      make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataSliceTest

Merged-In: I6d7e72a656723c0620d579e1e223945e2a3588af
Change-Id: I99b63b33395641ecd0b00997fa3792bbd59efeda
2020-08-05 15:08:59 +08:00
SongFerngWang
888e9cbdf9 Mainline remove hide api SubscriptionInfo.getCardString
Bug: 147128878
Test: build pass
Merged-In: Idb44af6a01626013339f5ca05486dd11112a5867
Change-Id: Ib222c08bc4baa3fdcaea1fa2020d7de6d6a4fcec
2020-08-05 07:07:11 +00:00
Bonian Chen
622da45ee6 Merge "[Settings] Data roaming warning only when turn ON" 2020-08-05 05:58:13 +00:00
Bonian Chen
b3b25c39c9 Merge "Removed reference to PhoneConstant PHONE_TYPE_*" 2020-08-05 05:55:32 +00:00
Malcolm Chen
3805373f90 Remove logic to manually search inactive pSIM.
Nowe inserted inactive pSIM will be included in Telephony's get
available and get selectable subInfo list so that logic is no longer
needed.

Bug: 147128878
Test: unittest
Merged-In: Icd131f133e47dae0770a4da71c51de3c2a94b42b
Change-Id: I9ba5dded7817116c02d70298c9c271ff6a99925b
2020-08-04 18:57:37 +08:00
Bonian Chen
76bd28fe60 [Settings] Data roaming warning only when turn ON
handlePreferenceTreeClick() goes after setChecked() however
configuration may have been altered within setChecked().

Follow same design within MobileDataPreferenceController to fix this
issue. A boolean state will be maintained as the condition when warning
dialog is required when click.

Bug: 148491064
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Merged-In: I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d
Change-Id: I2f9998e87b053c8d30af48f977ef58a7fe9ea829
2020-08-04 18:35:13 +08:00
Lee Chou
68c0ba35ec Removed reference to PhoneConstant PHONE_TYPE_*
replaced with TelephonyManager.PHONE_TYPE_*

Bug: 147469330
Test: m RunSettingsRoboTests
Merged-In: I286c4879d55e28707081d4cacba1a2c444f92646
Change-Id: I9941b1ce438a06d05af0276bff2e769ec5e3d438
2020-08-04 18:15:42 +08:00
Bonian Chen
1efdd7d3ba Merge "[Settings] Update EID in background" 2020-08-03 08:34:07 +00:00
Bonian Chen
44bc04a137 [Settings] Update EID in background
Access EID in background thread to avoid blocking UI.

Bug: 153407357
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: Id30851bbd0b0fe080ed703586f9718be8b97abdd
Change-Id: I23fc6168d939bb5cb5e281413462176e7221819c
2020-08-02 22:38:13 +08:00
Raff Tsai
53cbfe28bb Hide sliceView if Slice is null
Fixes: 142035673
Test: robolectric, visual
Change-Id: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
Merged-In: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
2020-08-02 12:26:10 +00:00
Treehugger Robot
2c5a28bb2d Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 05:51:09 +00:00
Curtis Belmonte
5612e2c5c7 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: Ib5f445c3987c6eda2c3f3be8b9ac641c4e7f934e
2020-07-28 20:23:05 +00:00
Curtis Belmonte
1e8c7905a2 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I4ecfd2d806314e7dc3bbff00849ad4be6f81d506
2020-07-28 20:16:03 +00:00
Anton Hansson
0f6b2ec233 Merge "Add explicit dep on ims-common" 2020-07-22 15:55:41 +00:00
Anton Hansson
3d12fcb246 Add explicit dep on ims-common
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
Merged-In: Ic663e206a0e2e780be2f27b5d539c274d4eef245
2020-07-22 14:40:27 +00:00
Treehugger Robot
d6ac86d602 Merge "Remove "storage type" preference from Settings" 2020-07-22 08:34:56 +00:00
joffenberg
43ee102921 Remove "storage type" preference from Settings
Since storage type is mandated as hardware-backed, this preference is no longer meaningful.

Bug: 160225361
Test: atest SettingsRoboTests
Change-Id: I9b6c1d6afdd3563201b1e85673acf4d8cb81c0a1
2020-07-21 17:18:47 +02:00
Neil Fuller
1d45573eb2 Merge "Track core platform API change" 2020-07-20 14:39:35 +00:00
Neil Fuller
d1c4ea906f Track core platform API change
This commit tracks changes in libcore to extend the IDs recognized
to be associated with a country.

Bug: 155738410
Test: treehugger
Change-Id: I0d75b6c41cdce4a373f73761ccd2d7db357d6548
2020-07-20 11:26:14 +01:00
Eran Messeri
f37c8cb4f7 [DO NOT MERGE] Rollup Cert-related changes from R
This change includes the following commits from internal R branch
which are related to certificate management:

0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings

Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
2020-07-15 15:12:06 +01:00
vichang
268371c44e Merge "Move libcore.timezone to the i18n module - Final part" 2020-07-02 10:25:54 +00:00
Victor Chang
b07e53c1c8 Move libcore.timezone to the i18n module - Final part
Bug: 141747409
Test: atest CtsLibcoreTestCases  CtsLibcoreTestCases
Change-Id: I48a1f383403a553639f525ef92996292fab84c5e
2020-06-30 14:35:09 +01:00
Treehugger Robot
b1cea4f1bc Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" 2020-06-29 14:14:47 +00:00
LuK1337
ad243904db Settings: Fix fallback summary for power_button_instantly_locks preference
* Using summary_placeholder instead of summary_empty
  leaves an ugly empty space.

Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
2020-06-29 12:27:06 +02:00
markchien
500ce1d4c8 Remove schedule recheck logic from TetherService
This change just remove unused code.
Tethering no longer ask TetherService to schedule recheck
(use #EXTRA_SET_ALARM) from Android Q. Intead Tethering
(EntitlementManager) would schedule the recheck by itself.

This change is necessary in order to move the resourcesout
of the framework because TetherService needs to know when
it need to re-run entitlement recheck from framework res
(config_mobile_hotspot_provision_check_period).

Bug: 146918263
Test: atest TetherSerivceTest
Change-Id: Ie45859c19b96d0689c45dd610501fae0506742ff
Merged-In: Ie45859c19b96d0689c45dd610501fae0506742ff
2020-06-19 23:04:43 +08:00
Treehugger Robot
37c9c5b514 Merge "Revise strings as per string UX review" am: 110d7ff721
Change-Id: I523fe708d2ff6cacafec362c05e227ae5dda07c8
2020-05-06 03:23:40 +00:00
Treehugger Robot
110d7ff721 Merge "Revise strings as per string UX review" 2020-05-06 03:06:40 +00:00
Xiangyu/Malcolm Chen
30792ed811 Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45
Change-Id: I6e2235612a27168fc095773e0638da0c9602addd
2020-04-30 17:38:16 +00:00
Malcolm Chen
97a8568e49 Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest.
Bug: 154566065
Test: robotest
Change-Id: I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3
Merged-In: I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3
2020-04-27 18:19:44 -07:00
Brad Ebinger
c973423a34 Revise strings as per string UX review
Fixes: 154148793
Fixes: 155098265
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Merged-In: Ia510ce5262fbe576718b0785175c0a82acb3c722
Change-Id: Ia510ce5262fbe576718b0785175c0a82acb3c722
2020-04-27 18:00:29 -07:00
Bonian Chen
ee2b1d1561 Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b am: 1dcc1037dd
Change-Id: Ic2c8fc4e5ef11373058b9c9b3444c3c2c0c772a5
2020-04-09 05:35:46 +00:00
Bonian Chen
1dcc1037dd Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b
Change-Id: I532654e3c3a5650ff36963b0e2172a66ec39baa5
2020-04-09 05:22:20 +00:00
Bonian Chen
61e003440b Merge "[Settings] Refactor of Wifi Calling part" 2020-04-09 05:04:15 +00:00
Bonian Chen
5042276cf7 [Settings] Refactor of Wifi Calling part
Refactor of Wifi Calling to avoid accessing hidden APIs.
This includes the following cherry-picks on the corresponding files:
I455685eb26df69d929ff3ed3c26ce84aa5f6b1f8
I1a67db80b114a438afda7d45af90e54af38703c3
Idd4935a6d8ceed77c15e90f96781014d1940a427
Ia5179ee1a23f054899bc74c796542bae40cdc8d5
I57c91a095fc4d454d92e8d78e0b647b4f098c6a3
I8a09264f83b9fc4fce3f79ec3aeb6ae757b004e4
I68462368669b81e10d09bbb93e74e23ea9a1f446
I9c54eb63a0df3fde38965ee7e2ae46cc1b7efd47
I0d5dcfc33b0bddacf059d1fb9af559646e32e68a
I45977c850977be84c0dc1f6461e68a1941efc1a2
I46c047359257ddd5cb3e331add4856b01c5c9739
I35246811d3e01d0b2ca197e9a1ed7081691cd982

Bug: 140542283
Test: build pass
Change-Id: I2cddeefb7cc5f1b2060e572a73560f7cd6204d0b
2020-04-09 01:35:07 +00:00
Treehugger Robot
56c6ff781c Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e am: a097d46cc1
Change-Id: I8edb12c3ebf05675148bbb10c35a675c00bd4570
2020-04-08 20:03:25 +00:00
Treehugger Robot
a097d46cc1 Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e
Change-Id: I266d033b676aebf682028a4ae01570cb1d3accd1
2020-04-08 19:48:40 +00:00
Treehugger Robot
8889d6012e Merge "Show footer to notify user no 5G in DSDS mode." 2020-04-08 19:33:21 +00:00
Bonian Chen
b3e2be170f Show footer to notify user no 5G in DSDS mode.
(Cherry pick part of I5df95528aae12b43a15389b8048f14d9508272f3)

Bug: 151657272
Test: build pass
Change-Id: Iedfa26b320480cf4b606293c39a3ac94da1ad1fa
Merged-In: Iedfa26b320480cf4b606293c39a3ac94da1ad1fa
2020-04-08 17:55:25 +00:00
Bonian Chen
df97bbbdd5 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086
Change-Id: I5a1a3d423103971c0978e9e7dbdad216b398a159
2020-04-08 07:11:00 +00:00
Bonian Chen
733530e086 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b
Change-Id: If4f0e4b0c0d44ee6b7387a4a94c44d949706c557
2020-04-08 06:56:14 +00:00