Commit Graph

41966 Commits

Author SHA1 Message Date
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
Alex Johnston
4c1272a921 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
2022-01-06 01:21:41 +00:00
Alex Johnston
db9333baac Add non system overlay flag to RequestManageCredentials
Bug: 205150380
Test: Manual testing with Settings and TestDPC
Change-Id: I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0
Merged-In: I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0
2022-01-05 20:19:47 +00:00
Chen Xu
fb2acc0f78 Merge "eSIM deprecated API test Refactoring" am: a4f936408c am: 688f9d61cd am: 3387491083
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: I95bbd270044702f0ed61b8f3cb0af03d6924ad4e
2022-01-05 19:09:03 +00:00
Chen Xu
7639cd07ff Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895 am: cb851c79ae am: 44e579e3ea
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: Iec896dccd3c15be43a512a896bd6df6bb3e6c5b4
2022-01-05 19:08:59 +00:00
Yuri Ufimtsev
156980fdc7 Check if Preference is initialized before interacting
Test: manual
Test: adb shell am start -a
com.android.settings.security.SECURITY_ADVANCED_SETTINGS

Bug: 213182385
Change-Id: I95f628c4c4514511f1d830e0e6032e025eebc86b
2022-01-05 16:42:04 +00:00
TreeHugger Robot
1cbb603d60 Merge "FRP bypass defense in the settings app" 2022-01-05 05:37:51 +00:00
Tsung-Mao Fang
07dd833a6a FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-01-05 12:10:00 +08:00
Stanley Wang
c35cab1c7b Merge "Fix the problem that some items can't be searched in Privacy category." 2022-01-05 01:52:31 +00:00
Chen Xu
3387491083 Merge "eSIM deprecated API test Refactoring" am: a4f936408c am: 688f9d61cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
2022-01-04 20:02:29 +00:00
Chen Xu
44e579e3ea Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895 am: cb851c79ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: I580a094ed849679e0a7a96cd6c6558abe758a1ea
2022-01-04 20:02:25 +00:00
Chen Xu
a4f936408c Merge "eSIM deprecated API test Refactoring" 2022-01-04 18:50:10 +00:00
SongFerngWang
4fdf8be369 [MEP] eSIM deprecated API Refactoring
The telephony APIs were changed, the Settings needs the refactoring.

Bug: 206801604
Test: build pass.
atest QuerySimSlotIndexTest (PASS)
atest SelectableSubscriptionsTest (PASS)

Change-Id: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
Merged-In: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
2022-01-04 10:13:04 +00:00
Michael Groover
d1f76eea72 Merge "Add unaudited exported flag to exposed runtime receivers" 2022-01-03 17:35:02 +00:00
sandeepjs
dbe31b8e6b eSIM deprecated API test Refactoring
Test: build
Bug: 159354974
Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
Merged-In: Iedeb90f186ab9f82894e2fecef86d339c8989542
2022-01-03 12:15:02 +00:00
SongFerng Wang
4b906d564d Merge "Refine the mobile data selection UI" 2022-01-03 08:43:57 +00:00
TreeHugger Robot
1ee60270df Merge "Fix overlapping issue for Add a language page" 2021-12-30 12:05:07 +00:00
Mill Chen
28195f52a6 Fix overlapping issue for Add a language page
As the Add a language page changed its parent class, the collapsing
toolbar did not work smoothly. Also the nested scrolling feature of the
locale list is disabled, that caused the overlapping problem.

This change is to make the locale list enable the nested scrolling
feature.

Fixes: 207318265
Test: manual test
Change-Id: I95929cd569c94d392c325e4e5b2a35e78185d0b8
2021-12-30 16:23:18 +08:00
Betty Chang
fe76826c73 Merge "To disable Wi-Fi Direct when user restriction is set" 2021-12-29 09:55:00 +00:00
Weng Su
fe5690598c Check WiFi restrictions for WiFi QR code intent
- If WiFi configuration is not allowed, the WiFi QR code intent is
ignored.

- Add SafetyNet Logging to b/202017876.

Bug: 202017876
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppEnrolleeActivityTest

Change-Id: I147d2f4f4fabe2e24d5d3eaaad701b81059e8eee
2021-12-29 09:33:42 +00:00
Weng Su
03f3d9cbe5 Merge "Check WiFi restrictions for WiFi QR code intent" 2021-12-29 09:19:50 +00:00
changbetty
a639d26660 To disable Wi-Fi Direct when user restriction is set
- Remove the Location check for Wi-Fi Direct
 - Add user restriction check for Wi-Fi Direct

Bug: 204288318
Bug: 203170358
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I64dab964b485665dd42c933d8974aeda47f178fe
2021-12-29 07:20:15 +00:00
SongFerngWang
43ebe68063 Refine the mobile data selection UI
-Adding the margin for bottom at dialog
-Modify the text color of summay in the list at dialog when device is
dark mode.

Bug: 212396431
Test: build pass and check the dialog UI.
Change-Id: I1ec587fd9d64ad67bbf3479c7931c0a901f572cf
2021-12-29 14:31:13 +08:00
TreeHugger Robot
b74a9a3429 Merge "Fix WiFi toggle issue of Internet Settings" 2021-12-28 22:11:20 +00:00
SongFerng Wang
9e1da95036 Merge "The carrier name is wrong in the dialog" 2021-12-28 14:33:38 +00:00
Fabian Kozynski
cbe9bebb8e Start brightness dialog in same task
That way, enter and exit animations can be overriden

Test: manual
Fixes: 210177675
Change-Id: I77c33a77e3128597bfe09d427ba0c06e7c78136e
2021-12-28 14:16:33 +00:00
Weng Su
0219dc1378 Fix WiFi toggle issue of Internet Settings
- Because b/209906859 needs to add WiFi service check for WiFi-less
pixel project.

- But mWifiManager has not been initialized before the
addWifiSwitchPreferenceController() function, which will cause the
controller to not handle the WiFi switching UI.

- Add a hasWifiManager() function to initialize the WiFi manager and
handle related functions.

Bug: 212211915
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Idc0d4cdc31403f0ab9a4eb787e4c70be605f7ddb
2021-12-28 21:29:45 +08:00
Bonian Chen
779488b1ca Merge "[Settings] Add metrics for supporting performance measurement" 2021-12-28 10:37:44 +00:00