Commit Graph

28864 Commits

Author SHA1 Message Date
Antony Sargent
81aab4471a Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: Id759b8df825b2be7c0a4abff45630916807c1d19
2019-07-31 16:04:53 -07:00
Quang Luong
c2e859edee Merge "Copy WifiSettings base code into WifiSettings2 without WifiTracker" 2019-07-31 23:03:31 +00:00
Antony Sargent
ad2f49f851 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: I5792ff5333005e2e0c66fd24d594b79bf67d140c
2019-07-31 15:56:00 -07:00
TreeHugger Robot
4685c785b9 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev 2019-07-31 22:39:22 +00:00
Antony Sargent
482415d37e Protect entry points to add an eSIM when admin restricted
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.

The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.

The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.

Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
Quang Luong
b061428938 Copy WifiSettings base code into WifiSettings2 without WifiTracker
Copied main logic from WifiSettings into WifiSettings2, removing
all instances of WifiTracker in preparation of adding WifiTracker2.

Removed:
 - WifiDialog (to be added back in)
 - Context Menu (to be added back in)
 - Leftover SUW code (Next button)

WifiSettings2Test also copied directly from WifiSettingsTest, without
context menu test.

Bug: 70983952
Test: atest WifiSettings2Test

Change-Id: Ie1ef5bf0ca14f5989f4add2165422609f12c2c84
2019-07-31 11:46:15 -07:00
Raff Tsai
a64c7b2698 Merge "Fix Settings crash when click uninstall button" 2019-07-31 01:16:47 +00:00
Quang Luong
a5c8edb46f Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f am: 5c4a0e3444
am: b66a8c86a4

Change-Id: I2cfd0376d60efcc5fd417139bfcb3446a2485871
2019-07-30 17:37:41 -07:00
Quang Luong
b66a8c86a4 Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
am: 5c4a0e3444

Change-Id: Ib5545caea7cce930898c81fc0158877416666f89
2019-07-30 17:26:35 -07:00
Quang Luong
5c4a0e3444 Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: Ie1cdb83f47bac988b93401b3994a096d85333ce6
2019-07-30 17:16:00 -07:00
Quang Luong
815af2ba6e Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: I0adf1cc87a31b4daa762baf67e2e99415b35491a
2019-07-30 17:12:17 -07:00
Quang Luong
877d4d6d0a Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: I52e92aeffd349ed17f832b34b352f28a6c575ccb
2019-07-30 17:10:59 -07:00
TreeHugger Robot
17908b1e8f Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev 2019-07-30 23:33:22 +00:00
Antony Sargent
74023e3057 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b am: 5a39d48ab2
am: 96c01305b2

Change-Id: Ife5f1280f1a4bc23223c862d97b1b4750a4c4575
2019-07-30 16:12:23 -07:00
Antony Sargent
96c01305b2 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
am: 5a39d48ab2

Change-Id: I997f4cacaed95a2cc77af01cebc6d4452368d05e
2019-07-30 15:58:36 -07:00
Antony Sargent
d188932f64 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am: 66208e734b

Change-Id: I0123b5872e6a55f8c39ce4e07c0b740170178915
2019-07-30 15:45:19 -07:00
Antony Sargent
5a39d48ab2 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am: 66208e734b

Change-Id: I7e1494a1859393844ad5810a9721bf3865ed5f75
2019-07-30 15:43:32 -07:00
Antony Sargent
9e58a8df39 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am: 66208e734b

Change-Id: Ifb4c387a8663fda3a642b03b68777079d1c5a619
2019-07-30 15:43:32 -07:00
Antony Sargent
6d910e8608 Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-07-30 12:30:19 -07:00
Antony Sargent
0e6bbac235 Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d am: 42861b21c9
am: 01028402ca

Change-Id: Iad136b22b968e3a454944d090ae0d6594669f1da
2019-07-30 10:43:38 -07:00
Antony Sargent
01028402ca Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d
am: 42861b21c9

Change-Id: I1b1b85bbdac1e12c51c855686a5c25e5581a40e4
2019-07-30 10:15:54 -07:00
Antony Sargent
12a04d695e Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
am: 985d3d570d

Change-Id: If1eb34ad104dd55cf749bd2fabdca4fed16f93dc
2019-07-30 10:05:31 -07:00
Antony Sargent
42861b21c9 Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
am: 985d3d570d

Change-Id: Ic653102f8f66c0f5e1e3457750cdf150f1dbfd5e
2019-07-30 09:54:25 -07:00
Antony Sargent
20c9eff53e Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
am: 985d3d570d

Change-Id: I02252dd85f3b11aef3109e1a0193faba8bb9c240
2019-07-30 09:54:25 -07:00
TreeHugger Robot
985d3d570d Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev 2019-07-30 16:41:29 +00:00
Raff Tsai
88228c3399 Fix Settings crash when click uninstall button
When mPackageName is null, mFinish is true. OnResume() doesn't
invoke refreshUI(). It causes uninstall button is still enabled.
The solution is hiding AppButtonsPreference when mFinish is true.

Fixes: 138524326
Test: make RunSettingsRoboTests ROBOTEST_FILTER
Change-Id: I9759e53f002afbd4c88d8d536df3bf01c343135e
2019-07-30 11:18:09 +08:00
Julia Reynolds
104bc8e133 Merge "Move channel listing into a pref controller" into qt-qpr1-dev
am: 2d035ddfa2

Change-Id: Ie6d1c1ec4fdd2c074884d258379889bdb120a0d4
2019-07-29 13:24:07 -07:00
TreeHugger Robot
2d035ddfa2 Merge "Move channel listing into a pref controller" into qt-qpr1-dev 2019-07-29 18:42:25 +00:00
Julia Reynolds
f2c967c225 Merge "Fix launching of work profile notif settings" into qt-qpr1-dev
am: 0805e3d641

Change-Id: Ib221648a434d2d2d50a905971567792f23aa8b2c
2019-07-28 20:21:51 -07:00
TreeHugger Robot
0805e3d641 Merge "Fix launching of work profile notif settings" into qt-qpr1-dev 2019-07-29 02:28:37 +00:00
Kevin Chyn
adef4840f3 Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.

BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.

The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.

Bug: 138279856

Test: BiometricPromptDemo, enable device credential fallback, get into
      lockout state, successfully enter password. API result is
      success instead of "canceled" now.

Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
(cherry picked from commit 49c7d07650)
2019-07-28 22:26:26 +00:00
TreeHugger Robot
31ef40552b Merge "[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit - II" 2019-07-27 08:54:26 +00:00
TreeHugger Robot
689a5e91c4 Merge "[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit - I" 2019-07-27 08:39:26 +00:00
Kevin Chyn
f0e9fb7e02 Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97 am: 7baab69bdc
am: bdebaf4396

Change-Id: I34626608c014668887e33da40b80585aa5e66d7c
2019-07-26 18:46:38 -07:00
Kevin Chyn
bdebaf4396 Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97
am: 7baab69bdc

Change-Id: I46b98ccd554566433c1d11272677894960fd2d16
2019-07-26 18:26:47 -07:00
Kevin Chyn
10fe104f06 Add ability to finish() ConfirmDeviceCredential if it loses foreground
am: e27a304b97

Change-Id: Idcc2dab10c42016f0f440cbf495974bf3ee1ba94
2019-07-26 18:13:32 -07:00
Kevin Chyn
25f9f63969 Add ability to finish() ConfirmDeviceCredential if it loses foreground
am: e27a304b97

Change-Id: I4bca07e715a2d9a928fee0da7109b51a9c6eb6b2
2019-07-26 18:10:57 -07:00
Kevin Chyn
1c1191b640 Do not request cancel authentication unless currently authenticating
am: 49c7d07650

Change-Id: Id38d3648f75a79a3492677416c79fff960317a69
2019-07-26 17:48:44 -07:00
Kevin Chyn
e27a304b97 Add ability to finish() ConfirmDeviceCredential if it loses foreground
If user enters face settings but does not enter the password, then
turns off the screen, it's possible the challenge is invalidated. Instead,
we should finish() the device credential screen as well as FaceSettings.

This prevents
1) The user from being prompted for credential with lack of context
2) Credential returning a HAT that wraps an invalidated challenge

The user will be returned to the security settings screen, where they
have more context and can decide if they want to enter face settings again.

Fixes: 138273242

Test: 1) Open face settings, do not enter password
      2) Press power button
      3) Unlock keyguard
      4) User is not presented with credential screen
Test: Go through SUW, turning on/off the screen at various security
      screens. Able to enroll successfully

Change-Id: I3c3d4600138012821bb0eea7d2927df00011cdb0
2019-07-26 16:42:14 -07:00
Kevin Chyn
73d94f79e1 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d am: 6d549437af
am: 75517cb6a8

Change-Id: I76ed62db979d0729269e47b35ac607ce09aae244
2019-07-26 13:13:57 -07:00
Kevin Chyn
75517cb6a8 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d
am: 6d549437af

Change-Id: If055528ab0d92318fc552c2396465cecd8e5acea
2019-07-26 12:45:44 -07:00
Kevin Chyn
3090fc975e Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am: ba4fad160d

Change-Id: I89a892d9b5a626d236031a4e345297c791c8950b
2019-07-26 12:44:44 -07:00
Kevin Chyn
6fdc3745c3 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am: ba4fad160d

Change-Id: Iea3b2552097a1decd9dc106e3a31d71d772ab1d6
2019-07-26 12:35:33 -07:00
Julia Reynolds
c400ce3c80 Move channel listing into a pref controller
And a hidden preference category. This makes
hiding/showing the list a lot cleaner and also allows more
of the code to be tested.

Also delete some unused code that no longer complied after
this refactor.

Fixes: 133443871
Test: atest
Change-Id: I4a5fe0e075019bae2df44a0a9dcec26a40ee6d12
(cherry picked from commit a295d71c94)
2019-07-26 19:24:43 +00:00
Julia Reynolds
19c4ea4da1 Fix launching of work profile notif settings
Test: manual
Fixes: 132289017
Change-Id: I3c177aae1f4dd46556b652253d24b225d01987eb
(cherry picked from commit 142920e0c2)
2019-07-26 19:24:17 +00:00
Kevin Chyn
49c7d07650 Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.

BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.

The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.

Bug: 138279856

Test: BiometricPromptDemo, enable device credential fallback, get into
      lockout state, successfully enter password. API result is
      success instead of "canceled" now.

Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
2019-07-26 12:21:51 -07:00
Antony Sargent
efa7716533 Refesh mobile network details page on carrier config changes
In general the mobile network details page has several preference
controllers that don't listen to carrier config changes, so instead of
having each one add a listener, we instead just have one listener and
refresh the entire page when we see the broadcast.

Fixes: 135587885
Test: make RunSettingsRoboTests
Change-Id: Iff5b28dbfe12d94c901b442b23cece8e68218983
2019-07-26 12:00:39 -07:00
Kevin Chyn
0a33d62a17 Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.

BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.

The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.

Bug: 138279856

Test: BiometricPromptDemo, enable device credential fallback, get into
      lockout state, successfully enter password. API result is
      success instead of "canceled" now.

Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
2019-07-26 11:20:10 -07:00
Yanting Yang
a299fc5435 Fix NPE of launching Settings with malicious URL
Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e
2019-07-25 21:40:28 +08:00
Arc Wang
eca48078d5 [Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit - II
Refine code:
1. Change method name from getSpinnerAdapterWithEapMethods to getSpinnerAdapter
   and apply it to other Spinner adapters.
2. Change method name from getSpinnerArrayWithEapMethodsTts to
   getSpinnerAdapterWithEapMethodsTts and it will
   setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
   for adapters.
3. Remove the code of ag/8693033
4. Improve indentation.

Bug: 135127581
Test: WifiConfigControllerTest
Change-Id: I653eda11ca1b8235c5ecaa1a826a2fddd004d2e1
2019-07-25 14:51:35 +08:00