Commit Graph

715 Commits

Author SHA1 Message Date
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
6afb84d6b2 Merge "Mainline: removed legacy UI for network selection mode." 2020-08-05 06:56:38 +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
SongFerngWang
7e045ab9f6 Mainline: removed legacy UI for network selection mode.
This cl base on ag/10098777. Now 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: build pass
Merged-In: I1a0f431f05268d29afce145c3eb720594cfc57a3
Change-Id: I54ed8c69edcdc618f8cf8df8af0fffc8c4f187e8
2020-08-05 12:58:53 +08: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
SongFerngWang
87af2abc83 mainline: remove CarrierConfigManager.init
Bug: 147469789
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Merged-In: I2a72d409574fc281e5de57d58a27551dd040d551
Change-Id: I2535275d116887ed4b107fc530c85b4cbc5ad0d5
2020-08-04 10:18:54 +00: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
fdb57510cd Merge "[Settings] Avoid from crash" 2020-08-03 08:33:47 +00:00
Bonian Chen
14b0af4343 Merge "[Settings] Refactor for performance" 2020-08-03 08:33:30 +00:00
Bonian Chen
35be6641af Merge "[Settings] Allow talkback to focus and select APN" 2020-08-03 05:25:43 +00:00
Bonian Chen
fdb3a35efe [Settings] Avoid from crash
Avoid from crash when updateState() performed before
displayPreference().

Bug: 141833767
Test: make RunSettingsRoboTests -j
ROBOTEST_FILTER=ApnPreferenceControllerTest

Merged-In: I4008010077c61930487fef01af306ccdfd69e38f
Change-Id: Ic6421532d5435a577f765f23a69681bb9b8a1bd0
2020-08-02 22:50:06 +08:00
Bonian Chen
570d5441d3 [Settings] Refactor for performance
Refactor DataDuringCallsPreferenceController in order to reduce the time
spend on constuct and initialize DataDuringCallsPreferenceController.

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest
Merged-In: I484cafa739f9e6e58427894712f2bb7e2ed1f4ff
Change-Id: Id4947606a4919f06ae5ed6ddedd02399a2ee930f
2020-08-02 22:44:11 +08:00
Bonian Chen
5331b6589b [Settings] Allow talkback to focus and select APN
Change the focus area to help talkback focus on APN items.

Bug: 149794675
Test: manual
Merged-In: I5f391be89a5b22095d6f0d04b187ea18970f18d4
Change-Id: I6d2d1624c5946a30b59343de06de6f79adf24011
2020-08-02 21:36:49 +08:00
Bonian Chen
fed54f7dc4 [Settings] Learn more link should be removed when not supported.
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.

Bug: 159510116
Test: manual
Merged-In: I36b74b2b4586546090fb88562e8f4f052a877709
Change-Id: If7061e0be201b2f98964a7b0eec42cc17cb11ae3
2020-08-02 21:14:25 +08:00
Zoey Chen
c33f162fc9 Improve the performance of displaying preference - multithread.
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 161691402
Change-Id: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
Merged-In: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
2020-07-22 13:17:43 +08:00
Wei Huang
012c5858c9 Fix mvno data field summary not update issue
With current code logic, whenever user changing
mvno type, it only updates mvno data field text,
but the summary is not get updated.
For example, there is an apn configured as mvno
type 'GID' and mvno data 'FF', and user changes
mvno type to:
1. 'none' then save, the APN is saved with mvno
   type 'none' and mvno data 'FF' while it is
   better to save mvno data as empty value.
2. 'imsi', although the APN can be saved with mvno
   type 'imsi' and mvno data 'mcc + mnc + x',
   the UI still display mvno data field as 'FF'
   unchanged(until user edit mvno data then save)
   while the mvno data text is already changed to
   'mcc + mnc + x'. It is better to also update
   mvno data summary as 'mcc + mnc + x'

With current patch, either adding new apn or edit
exist apn, the mvno data field summary is always
consistent with latest mvno data field text, which
won't make user feel confused.

Test: Build and manual test on device.
Change-Id: Ica72e246296c20a6d20283b315e6e6c46e80ac08
Signed-off-by: Wei Huang <hwbest.v@gmail.com>
Signed-off-by: Honggang Luo <luo.loky@gmail.com>
Signed-off-by: Chao Yuan <chaoyuanx@gmail.com>
2020-07-04 04:11:52 +08:00
markchien
6d2c010891 Get entitlement configuration from intent extra
Tethering resource configuration is move from framwork to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
    --> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
    --> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
    --> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID

Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently. Will replace hard code
string as tethering module-lib APIs in b/159085857.

Also move the entitlement response intent registeration from onCreated
to onStartCommand, this can avoid wrong intent registeration if subId
changed between onCreate and when the intent arrived.

Bug: 146918263
Test: atest TetherServiceTest
      atest TetherProvisioningActivityTest

Change-Id: I3d06df01302a9c1f0893712d9250fe394dc66588
Merged-In: I3d06df01302a9c1f0893712d9250fe394dc66588
2020-06-19 23:21:17 +08:00
markchien
e48a3d7a76 Remove isProvisioningNeededButUnavailable usage
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only. TetherUtil#isProvisioningNeeded and
isProvisioningNeededButUnavailable are no longer needed because
tethering would ensure entitlement app is valid if entitlement check is
needed. Otherwise, tethering would return not supported that tethering
settings would be hidden.

Bug: 146918263
Test: m
Change-Id: If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c
Merged-In: If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c
2020-06-19 23:16:30 +08:00
markchien
dfd8d235a1 Replace ConnectivityManager as TetheringManager
Tethering APIs are all move to TetheringManager from Android R.
1. Replace ConnectivityManager tethering API usage as TetheringManager.
2. Use TetheringManager#stopTethering to disable usb tethering instead
of using deprecated ConnectivityService#setUsbTethering
3. Use TetheringManager#stopTethering to disable bluetooth tethering
instead of directly use BluetoothPan#setBlueoothTethering. So bluetooth
getProfileProxy is not needed in TetherService because tethering would
do that when calling #stopTethering.
4. Also support TETHERING_ETHERNET entitlement check that
TETHERING_ETHERNET is new added from Android R.

Bug: 146918263
Test: atest TetherServiceTest
Change-Id: Id969f29d7210f2ee32719c76439049bbc86cd4f6
Merged-In: Id969f29d7210f2ee32719c76439049bbc86cd4f6
2020-06-19 23:05:27 +08:00
Paul Hu
cbebca9881 Merge "Forward the ResultReceiver to Tethering Entitlement app" am: 6045e9b90d
Change-Id: I614914b738e3af198fe21b881d2e475e2e8eda41
2020-05-29 21:26:52 +00:00
Paul Hu
6045e9b90d Merge "Forward the ResultReceiver to Tethering Entitlement app" 2020-05-29 11:54:20 +00:00
paulhu
a788a3190c Forward the ResultReceiver to Tethering Entitlement app
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
Merged-In: I37fcaddd5569223146ff9d6316d97f33312d8d24
2020-05-29 00:06:52 +08:00
Treehugger Robot
6ea2228e31 Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
2020-05-27 01:52:00 +00:00
Brad Ebinger
525a07ec7f Fix NPE if CarrierConfigManager is not available
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-05-26 15:50:41 -07:00
Jeff Tinker
a5f7479f5a Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
2020-05-20 19:50:57 +00:00
Jeff Tinker
9c657c34f4 Revert "[Settings] Remove mobile network v1"
This reverts commit daf6c9e85b.

Reason for revert: Broken build 6513883 on aosp-master on errorprone

Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
2020-05-20 19:14:57 +00:00
Bonian Chen
075a17c995 Merge "[Settings] Remove mobile network v1" am: 10799d12fd
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
2020-05-20 12:45:32 +00:00
Bonian Chen
daf6c9e85b [Settings] Remove mobile network v1
Cherry-pick of Ib365ba712af62729ca35abbc370aef087ce52a90

Fixes: 142920912
Test: rebuild, robolectric
Merged-In: Ib365ba712af62729ca35abbc370aef087ce52a90
Change-Id: I1554d475e0f34971381dcc42817573f98f958825
2020-05-20 07:49:33 +00:00
Zoey Chen
6622ff7181 Merge "[Settings] Code refactor" am: f4d59078fb
Change-Id: I65a011ca26c574d53d7ae3c2551fe6aa44f9c861
2020-05-19 10:15:33 +00:00
Bonian Chen
e9911c28cf [Settings] Code refactor
Code refactor.

Bug: 141833767
Test: manual
Merged-In: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
Change-Id: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
2020-05-19 16:48:11 +08:00
Zoey Chen
2673571d28 Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca
Change-Id: I1d486a18f7b0a9b7eb79ac3d28ebbdc0cdfa88c9
2020-05-19 08:23:13 +00:00
Bonian Chen
cede995c5d [Settings] Code refactor for availability session
Code refactor for session design of availability status config.

Bug: 141833767
Test: manual
Merged-In: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
Change-Id: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
2020-05-19 11:41:59 +08:00
Zoey Chen
9cc7978d0a Merge "Improve the performance of displaying preference." am: f0322ab48e
Change-Id: I27fdfb879d8081ebd949f57799f10daa2d0f8c2d
2020-05-19 03:22:10 +00:00
Zoey Chen
ad9b5c3b56 Merge "[Settings] Avoid rendering hidden preferences" am: b4b612a8e3
Change-Id: I75cf82d73c30583c5e7983e90af50da43246abfc
2020-05-18 08:58:01 +00:00
zoey chen
20d88eb2a8 Improve the performance of displaying preference.
- Set a variable to record the status then replace getAvailabilityStatus() with it.

Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 154061428
Merged-In: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
Change-Id: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
2020-05-18 16:51:13 +08:00
Bonian Chen
cc6a88bf6c [Settings] Avoid rendering hidden preferences
Under dashboards with expand button, preferences are renderred even
not been expanded.
Avoid from rendering un-expanded preference can improve the performance
of dashboard display.

Bug: 141833767
Test: manual
Merged-In: I00c6f827a0b7b7cec6a6fd8c809b94ca1dce88bb
Change-Id: I00c6f827a0b7b7cec6a6fd8c809b94ca1dce88bb
2020-05-18 03:17:09 +00: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
Treehugger Robot
72f8fa1c90 Merge "Settings: Hide carrier settings version if empty" am: 04b1e2415c
Change-Id: I5ed35dc059aae3c9d13f9fe02f7106ca075cf112
2020-05-05 08:15:36 +00:00
Wang Han
f05b2d22fc Settings: Hide carrier settings version if empty
* This gives bad UX if empty as it stays copyable
   and "clickable".

Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com>
Change-Id: Ia54a1d130e77b4440753f0ce69ae1726cc2c08d9
2020-05-04 13:39:30 +02:00
Treehugger Robot
ebea74264a Merge changes I6194592d,I5a02f847 am: 44146c8e3b
Change-Id: I2ebc5edd89fb32b2698c8cfd6acb20342c9cec17
2020-04-30 03:17:19 +00:00
Malcolm Chen
b6fa2277f6 Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
Change-Id: I3377b9cbc1d4722a8a96c18f40d1118e476c4ef7
2020-04-30 03:17:16 +00:00
Treehugger Robot
44146c8e3b Merge changes I6194592d,I5a02f847
* changes:
  Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
  Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Treehugger Robot
d6859736a4 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
2020-04-29 22:50:24 +00:00
Grace Jia
7098379555 Disable 'Mobile data' selection after removing SIM
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
2020-04-29 22:34:29 +00:00
Malcolm Chen
99e64da899 Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
Bug: 152786064
Test: build and manual
Change-Id: I6194592d9a7bf4d4b7993fc344d7392bf5c296aa
Merged-In: I6194592d9a7bf4d4b7993fc344d7392bf5c296aa
2020-04-27 18:19:13 -07:00