Commit Graph

41092 Commits

Author SHA1 Message Date
Alex Johnston
3fd5e0f7f8 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: Ia028b11274420bec314c22f967f0d7cbe0e88570
2022-01-11 21:33:10 +00:00
Alex Johnston
53ffad4bcc Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev am: 3ab85fbd60 am: 15c5e404bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414974

Change-Id: I24d5979f4673badf9eaa850556ab3c22b459c5d7
2022-01-11 21:25:53 +00:00
Alex Johnston
d8124d47f0 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: Ifbce4430f251b7b152538520f318e62900ea64b0
2022-01-11 21:09:59 +00:00
Alex Johnston
15c5e404bf Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev am: 3ab85fbd60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414974

Change-Id: I711098bc2c2fb999ae5841d60ea8b948791d28f1
2022-01-11 21:08:52 +00:00
Alex Johnston
3ab85fbd60 Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev 2022-01-11 20:47:28 +00:00
Julia Reynolds
4a7e2dff0d Merge "Always check roles for non-blockability" 2022-01-11 19:46:52 +00:00
Lais Andrade
a6e74db8c5 Merge "Use new Vibrator method to get default intensity per usage" 2022-01-11 15:16:30 +00:00
Oli Lan
8aec687b29 Add config flag in Settings to control whether restricted profiles are offered.
This adds a config resource to specify whether restricted profiles
should be offered as an option when a new user is added. This replaces
the previous check if a device is voice capable, and will be defaulted
to false.

Bug: 202854971
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserCapabilitiesTest"
Change-Id: If090fe8d902d6521acfde8c26e801aa4fc4f5ff4
2022-01-11 12:50:15 +00:00
Yuri Ufimtsev
ac06c38866 Merge "Use correct category key for SecurityAdvancedSettings based on the type of active Security Settings" 2022-01-11 11:21:41 +00:00
Treehugger Robot
61e1a07529 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 am: 039cdfd764 am: 5ea82e5955 am: b21993b793
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I4fe5dfdfc66aaad72a31de1761c28c6245db5bd6
2022-01-11 10:51:15 +00:00
Treehugger Robot
b21993b793 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 am: 039cdfd764 am: 5ea82e5955
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I21f0e516ec82f875638eabcd700fdead02048d7c
2022-01-11 10:03:53 +00:00
Yuri Ufimtsev
5ccccc181e Use correct category key for SecurityAdvancedSettings
based on the type of active Security Settings

Test: atest SettingsUnitTests:SecurityAdvancedSettingsTest

Bug: 206001340
Change-Id: I7bdac4b26653eedb45e3e2f056e6804a6c16cb18
2022-01-11 09:54:20 +00:00
Treehugger Robot
5ea82e5955 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 am: 039cdfd764
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I603a7c75d79b81f2b5e5809ed4292a5cba77a169
2022-01-11 09:46:19 +00:00
Jimmy Chen
bde88c4b8d wifi: add Trust-On-First-Use option for CA
Bug: 196180536
Test: * connect to a EAP-TLS network with TOFU option
      * make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I30b55d835bd073d604bddd235f2425bdc8b647af
2022-01-11 17:17:47 +08:00
Treehugger Robot
0ccb8750b9 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" 2022-01-11 09:06:50 +00:00
Yuri Ufimtsev
c02d474ba1 Merge "Check if Preference is initialized before interacting" 2022-01-11 08:48:33 +00:00
Bonian Chen
740809879f [Settings] Code refactor for modulization
Code refactor for clean up some internal dependencies.

Bug: 213836977
Test: Junit VpnPreferenceControllerTest
Change-Id: Ib6684c7b84bd04d9c1a015fa78d2c0ac5f1773c8
2022-01-11 15:55:13 +08:00
Junyu Lai
123f2e1581 [MS50] Remove NetworkTemplate#buildTemplate* usages
This is a no-op refactoring.
These functions are deprecated and replaced by
NetworkTemplate#Builder, use public API instead.

Test: make RunSettingsLibRoboTests
Bug: 204830222
Change-Id: Idc2a09d8e3789ca2c7a97691cfad4b2e2b417f0d
2022-01-11 02:53:03 +00:00
Bonian Chen
6d7e342bef Merge "[Settings] Code refactor for performance" 2022-01-11 02:01:23 +00:00
Julia Reynolds
6689b81b82 Always check roles for non-blockability
Test: NotificationBackendTest
Fixes: 194833441
Change-Id: I72af524c56178077caef8fedfac592f8b5df3371
2022-01-10 13:40:45 -05:00
PETER LIANG
928cb9006e Merge "New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (1/n)." 2022-01-10 16:14:10 +00:00
changbetty
06df9c9fc0 Add WiFi Enterprise restrictions check for WiFi Configuration Addition
When UserManager.DISALLOW_ADD_WIFI_CONFIG is set to true.
  - Disable the "Add network" item in the Internet settings.

  - Activity action API for ACTION_WIFI_ADD_NETWORKS should not be
    permitted and the user shouldn’t see a prompt for approval

Bug: 203169077
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest
Change-Id: I18d7703b5972bfbc12dca10b6432d756813abace
2022-01-10 16:06:20 +00:00
Lais Andrade
bd916b22a0 Use new Vibrator method to get default intensity per usage
Bug: 207477604
Test: builds
Change-Id: I031c1c532dac4762e1b74bebb77d773777f418a6
2022-01-10 15:43:16 +00:00
Yuri Ufimtsev
2e8a9b292d Merge "Refactor some Preference Controllers to use BasePreferenceController" 2022-01-10 14:48:13 +00:00
Yuri Ufimtsev
cdc2677cd1 Refactor some Preference Controllers to use BasePreferenceController
Test: atest SettingsUnitTests
Change-Id: Ic93f29d6c35cb1a43937fa7bf2f1e2d489cdd09f
2022-01-10 13:25:13 +00:00
Bonian Chen
c2e72bc8ad [Settings] Code refactor for performance
Move some logic out of constructor to reduce the loading when launch UI.

Bug: 213836977
Test: Junit VpnPreferenceControllerTest
Change-Id: I90c7770f529b4710196697886e566dfe1be629e4
2022-01-10 17:09:32 +08:00
Peter_Liang
c8f6bcc6fb New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (1/n).
Create preference fragment layout.

Bug: 211503117
Test: manual test
Change-Id: I16c01476b75c2eb6d83759233d4cc29bddfcd4a7
2022-01-10 04:24:02 +00:00
Yasin Kilicdere
7eeb727614 Merge "Add logging for settings entrypoint to add supervised user." 2022-01-07 20:58:14 +00:00
Yuri Ufimtsev
2fb7bac849 Exclude Privacy Settings from search if Safety Center is enabled
Test: manual

Bug: 206797394
Change-Id: I474064786642a7e772da03e13308a63f7dd2dd4b
2022-01-07 14:24:59 +00:00
Weng Su
0a1ef933ac Check WiFi restrictions for WiFi QR code intent am: fe5690598c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16544954

Change-Id: Id2ef05626ba9adce5365ab0f928b7bfc3d556246
2022-01-07 07:47:20 +00:00
Edgar Wang
4fb753d22e Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95)
2022-01-07 04:25:25 +00:00
Edgar Wang
181c7e32f5 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95)
2022-01-07 04:25:09 +00:00
Edgar Wang
9926187972 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95)
2022-01-07 04:24:53 +00:00
Edgar Wang
8e7cc8fa4d Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95)
2022-01-07 04:24:28 +00:00
Edgar Wang
dc44d01a16 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95)
2022-01-07 04:24:11 +00:00
Edgar Wang
f57d75f127 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95)
2022-01-07 04:23:50 +00:00
TreeHugger Robot
fe4d991e11 Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" 2022-01-07 02:48:14 +00:00
Bill Yi
39df254c94 Merge sc-qpr1 to aosp-master - DO NOT MERGE
Merged-In: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
Merged-In: I4f51c80cf4e32c384afad849c04c7c6afa065767
Change-Id: Ie466180309fcfe540492967e8bf3587b34928ded
2022-01-06 18:39:02 -08:00
Betty Chang
6c59266ef4 Merge "Add Enterprise restriction check for Wi-Fi QR code sharing" 2022-01-07 01:51:56 +00:00
Yasin Kilicdere
3a0ebebac4 Add logging for settings entrypoint to add supervised user.
Bug: 213442701
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: Ie6110b0ef5c16c9f83e3d939f78f21f003e55e35
2022-01-06 23:21:59 +00:00
Alex Johnston
35e3d0c1b0 Add caller check to com.android.credentials.RESET
* Only the Settings app can reset credentials
  via com.android.credentials.RESET.
* com.android.credentials.INSTALL should still be
  callable by CertInstaller.

Manual testing steps:
* Install certificate via Settings
* Verify unable to reset certificates via test app
  provided in the bug (app-debug.apk)
* Verify able to reset certificates via Settings
* Verify com.android.credentials.INSTALL isn't changed

Bug: 200164168
Test: manual
Change-Id: I9dfde586616d004befbee529f2ae842d22795065
(cherry picked from commit 4c1272a921)
Merged-In: I9dfde586616d004befbee529f2ae842d22795065
2022-01-06 22:17:17 +00:00
Edgar Wang
359512cd95 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
2022-01-07 00:07:16 +08:00
PETER LIANG
b43d872018 Merge "Update the background of the Daltonizer preview." 2022-01-06 14:49:10 +00:00
Fabian Kozynski
c8fc56e3bf Merge "Start brightness dialog in same task" 2022-01-06 14:18:52 +00:00
TreeHugger Robot
cdeb1595cf Merge "Fix WifiDialogActivityTest broken" 2022-01-06 13:56:09 +00:00
Peter_Liang
b408e19f4e Update the background of the Daltonizer preview.
Add the corner radii in to be consistent with the Settings style.

Bug: 213440059
Test: manual test
Change-Id: I68edf243ae33e9bb1e39020ad7553451fad66477
2022-01-06 21:02:50 +08:00
Weng Su
9bd8f046a9 Fix WifiDialogActivityTest broken
- The ShadowWifiManager class is not working as expected

- Use Mockito class instead of Shadow class

Bug: 175369329
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: Idbc851c4d9702be23561c2c48c9d7d077e5f452e
2022-01-06 08:45:40 +00:00
changbetty
c13303c585 Add Enterprise restriction check for Wi-Fi QR code sharing
- In the Internet Picker, if a user tries to long press on the SSIDs
   that cannot be shared, the “Share” option should disappear.

Bug: 203169712
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Iea5a25ba80f29be59c39988bba0dcc4689585461
2022-01-06 07:56:40 +00:00
Chen Xu
a1127f5996 Merge "[MEP] Use switchToSub API with pending intent" 2022-01-06 06:18:12 +00:00
TreeHugger Robot
72f9e8eaf0 Merge "Add caller check to com.android.credentials.RESET" 2022-01-06 03:07:42 +00:00