Commit Graph

1988 Commits

Author SHA1 Message Date
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
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
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
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
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
f1f6f6f366 Merge "Make URLs in Wi-Fi Calling help description clickable" am: 1118235580
Change-Id: Ia9e9a95554f4e0305ab4f73143574056c048fbb4
2020-04-07 04:40:07 +00:00
Treehugger Robot
1118235580 Merge "Make URLs in Wi-Fi Calling help description clickable" 2020-04-07 04:28:30 +00:00
Remi NGUYEN VAN
85f97bf02a Merge "Adjust code for API council feedback" am: aab7aca759
Change-Id: Idd49347f191f75bbe05b45fcfa47856d87c983bb
2020-03-30 03:06:07 +00:00
Chalard Jean
48adfc076e Adjust code for API council feedback
Bug: 151322799
Test: SettingsUnitTests

Merged-In: I5ff389f3f707e5538979830c2252455bea5bbb88
Change-Id: I5ff389f3f707e5538979830c2252455bea5bbb88
2020-03-27 04:28:28 +00:00
Revathy Sivalingam
4e00cbcb2b Make URLs in Wi-Fi Calling help description clickable
Make URLs in Wi-Fi Calling help description clickable. This enables
carriers to add a link in the description that takes the user to a web
page with further information about Wi-Fi Calling.

Bug: 151326849
Test: manual
Change-Id: Icc66faa07105607a36b0d964ffc8ac5aafacb734
2020-03-13 15:51:03 +01:00
Automerger Merge Worker
3af57b3c28 [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93
Change-Id: If45cb2b3e0c37b16047ff0c393da1cbfb379b091
2020-03-04 02:32:45 +00:00
Arc Wang
9e46a0bc93 [Wi-Fi] Ignore incorrect user certificates
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.

Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idcbc80aa3e945f83ba6b77ebf9ef443398ef8e3c
Merged-In: Iab35ac975933abc54fda83b99a2109d53d6722d4
2020-03-02 22:28:46 +08:00
Automerger Merge Worker
9e2de70584 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5
Change-Id: Ifeeb244d4dddebb4b05b4a7489d0fb28a195c4ad
2020-02-28 06:16:40 +00:00
Automerger Merge Worker
fd2e26d4aa Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca
Change-Id: I8a1f4c22237436e5e2e262a3723c39ae346a87fa
2020-02-21 16:44:30 +00:00
Joshua Duong
0110afcc46 [adb-wireless] Add Wireless Debugging Switch in Developer options.
Bug: 111434128
Bug: 119492574

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebugging
Change-Id: I188badb43035172642cf235bb27e56d3a1dea169
Merged-In: I188badb43035172642cf235bb27e56d3a1dea169
2020-02-20 06:13:15 +00:00
Arc Wang
f3848729b4 [Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS
To improve security.

Bug: 143601727
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idb93d5ca1eb81bdcc2bc139679f72053161e3e35
Merged-In: I0cb1ceda6d89a52224f80ea5ffd1af709a6acace
2020-02-03 11:21:30 +08:00
Automerger Merge Worker
98a0e0ec96 Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev am: 5b71fccabd
Change-Id: If7bce1789dd81d3f77766fd9ed71dbc6738fb857
2019-12-18 02:46:11 +00:00
Arc Wang
be02f16b3a [Wi-Fi] Fix transition mode problems
Replace SECURITY_PSK_SAE_TRANSITION & SECURITY_OWE_TRANSITION with
AccessPpoint#isPskSaeTransitionMode() &
AccessPpoint#isPskOweTransitionMode()

Bug: 144320676
Bug: 144320649
Bug: 144325162
Bug: 144321574
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I6596c48ea54adcaf579682634965c379c7938895
Merged-In: Ic3c7ac1238a51b6e215ed63761720d2bc371d012
2019-12-09 19:20:55 +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
37e02742a4 Merge "IMS: Grey out Wifi calling option when either sub is having call."
am: 262b4f7434

Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
2019-11-26 17:46:38 -08: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
Pooja Jain
812f8e9065 IMS: Grey out Wifi calling option when either sub is having call.
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.

Test: Manual

Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
2019-11-25 12:10:03 +05:30
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
Hai Shalom
775106e40d Merge "Revert submission" into qt-qpr1-dev 2019-11-22 03:46:02 +00:00
Hai Shalom
40e7c05e53 Revert submission
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.

Change-Id: I65868205cc8241f8179006256e6e13698ad79d64
Merged-In: I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f
2019-11-21 23:09:22 +00:00
James Mattis
1f3415f36e Merge "Swap param order in registerSoftApCallback"
am: 76632c01fd

Change-Id: Id33581fd71070e23a561ca34e76f0623d66e2852
2019-11-20 10:32:44 -08:00
Hai Shalom
fae6ecbbae Merge "[WPA3] Hide connect button for cloned networks not in range" into qt-qpr1-dev 2019-11-18 21:29:41 +00:00
James Mattis
def3e9f734 Swap param order in registerSoftApCallback
Moving executor to be the first argument in registerSoftApCallback.

Bug: 144379300
Test: Manually on pixel 3

Change-Id: I5563c1059cc04014a0fd909e2508f7bf497d708e
Merged-In: I5563c1059cc04014a0fd909e2508f7bf497d708e
2019-11-18 13:16:34 -08:00
Hai Shalom
36b3d9b8cf [WPA3] Hide connect button for cloned networks not in range
Cloned networks are WPA2 or Open networks that have a WPA3 or OWE
cloned networks with the same SSID and credentials. When an AP
in transition mode is in the area, the scan results will only
report the higher security level. In order to prevent a case
where the user forcely connects to the AP with the lower security,
disable this option for those networks. Otherwise, it will look
that Wi-Fi is connected, but Wi-Fi picker will not show a connected
network.

Bug: 143843364
Test: Manual test
Change-Id: Id002b109bd056105ec8335acd298fa3b314c73f3
Merged-In: I7244c41d3bf12ba573c3cfca077d0ac2cfdcf5ed
2019-11-16 01:45:58 +00:00
James Mattis
ff7d499b18 Merge "SoftApCallback using executor vs handler"
am: 60bd816476

Change-Id: Ie1fa6d76883ed5ee1a9e4390637a8f514e4cdbdf
2019-11-15 15:35:43 -08:00
James Mattis
90c23d2fe7 SoftApCallback using executor vs handler
Updating classes to support making SoftApCallback methods available to @SystemAPI including
the API for registration of a SoftApCallback which includes a change to
now use executor vs handler.

Bug: 143564153
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Also tested manually on a Pixel 3.

Change-Id: I952ad10dd88b7d97b3cd86b269b8f67b00b1fa15
Merged-In: I952ad10dd88b7d97b3cd86b269b8f67b00b1fa15
2019-11-13 21:39:26 -08:00
James Mattis
24546e531f Merge "Support for hotspot client visibility."
am: 2b7c8937de

Change-Id: Ib52bd8e9fa9a2affdd02771c1f64e86297c50458
2019-11-13 08:53:37 -08:00
James Mattis
03d65cee36 Support for hotspot client visibility.
Adding support for visibility into clients that connect to an active hotspot.

Bug: 137309578
Test: Tested manually on a Pixel 3.
Change-Id: Ife4bb5ca7bbcf075683cb0a233f2b5716ccd51d9
Merged-In: Ife4bb5ca7bbcf075683cb0a233f2b5716ccd51d9
2019-11-11 22:30:45 -08:00
Xin Li
c73fd84126 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: Ibae6b218a616a93cfda05dd77a5ea6f3a2dc4cea
2019-10-30 11:49:56 -07:00
LuK1337
b056ea70f0 Settings: Fix QrCamera crash on devices without flash
Change-Id: Ife34b5fb87a9a4f509b665a3433e0b2ba857c885
2019-10-30 02:45:08 +00:00
Xin Li
52bb254eea Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: I3850f512dadd5e2c6d51af3c8abab1fa5dbc86ad
Merged-In: I46ad5cff3809191483b48fe292dba220a0d699c6
2019-10-25 10:28:05 -07:00
Aaron Huang
f67076dad5 Merge "Replace getNetworkPrefixLength() with public API" 2019-10-25 05:15:16 +00:00
Aaron Huang
9251280615 Replace getNetworkPrefixLength() with public API
Use public API getPrefixLength() instead

Test: build pass

Change-Id: Ib85aa12dc22ac5b03c9bb7101beaf340014eb4fd
2019-10-24 10:51:53 +00:00
Lucas Lin
5eda5a3e7f Merge "Improve the wifi description for the case of private DNS broken"
am: 37b17ae752

Change-Id: I46ad5cff3809191483b48fe292dba220a0d699c6
2019-10-23 02:52:01 -07:00
Lucas Lin
37b17ae752 Merge "Improve the wifi description for the case of private DNS broken" 2019-10-23 09:20:09 +00:00
Paul Hu
67fe04814d Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7 am: 3a728ae13b
am: a6dadc465b

Change-Id: I08a04f4e627ce876a3cabd194a9838a0b5ce8459
2019-10-01 03:15:14 -07:00
Paul Hu
3a728ae13b Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
am: a67ca4cfd7

Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab
2019-10-01 03:03:36 -07:00
lucaslin
570f7dbc4b Improve the wifi description for the case of private DNS broken
Currently, users don't know if the wifi description shows
"No internet" means it really doesn't have internet access or no
internet is because of private DNS resolution failed. So, Add a
new description for wifi when private DNS is broken.

Bug: 113242081
Test: make -j44 RunSettingsRoboTests \
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest

Change-Id: I44a7e51cf76dc3f2a6b9583f226af6649f9b1f5f
2019-09-26 15:55:01 +08:00
cosmohsieh
7aee812888 Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
am: 17cbea0112

Change-Id: Icc3c00f542746c1ffa423c04c160ba85e53ad834
2019-09-12 14:09:30 -07:00
TreeHugger Robot
17cbea0112 Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev 2019-09-12 20:49:56 +00:00
paulhu
52d24750a4 [Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.

Bug: 32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
2019-09-12 17:21:43 +08:00
Arc Wang
40f22313dc Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
am: ec3055b9eb

Change-Id: I89755845ae509051e4fc2fcfb8f1dd1ee5ab195c
2019-09-12 01:14:57 -07:00
Arc Wang
31a79feccd [Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network
Should only allow saved network UI initialization for once.

Bug: 140362368
Test: WifiConfigControllerTest
      manual:
      Manually change EAP method and other security fields for a saved
      Wi-Fi neterprise network.

Change-Id: Iddc1dae53849760f43b41b75262358dff6ba09af
Merged-In: Iddc1dae53849760f43b41b75262358dff6ba09af
2019-09-05 14:57:07 +08:00
cosmohsieh
98690197e6 [Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection
Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.

Bug: 138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
Merged-In: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
2019-09-05 14:22:00 +08:00