Commit Graph

99816 Commits

Author SHA1 Message Date
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
PETER LIANG
20ec35ec34 Merge "Add new Text and reading options preference into the a11y settings." 2022-01-07 11:39:10 +00:00
Bill Yi
fbe6fd97b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8b732b18aa1e28bd59972d3ad51f2fa00d0e7973
2022-01-07 10:32:46 +00:00
Bill Yi
f69d80aa34 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iec8d44a0966c47b347de5290f9a3bc5f5c54dc6c
2022-01-07 10:29:08 +00:00
Bill Yi
9fed0efc79 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I089bd7964eff40566f6e0e5f29419ffffd0e8525
2022-01-07 10:25:35 +00:00
Bill Yi
a23cb25511 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I82f24cc8798f2df1ddde782a9019178ca89d70e9
2022-01-07 10:21:29 +00:00
Bill Yi
64a765a14c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifcad6860e4664730c2d0e5826018623ab161db4a
2022-01-07 10:17:54 +00:00
Bill Yi
6ad216fce4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0a648477cbd18dc003cae1dfa61a3387d8f76536
2022-01-07 10:16:21 +00:00
Bill Yi
ac0bd999f1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If79c3e0fd0ebe9847befbf0f32184782cbc5f7e2
2022-01-07 10:14:50 +00:00
Bill Yi
966558f7f7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2a005207a81ddef8b2ea722187a9f4ab73ecb0d4
2022-01-07 10:13:18 +00:00
Bill Yi
a5c8abc5a2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I31226808bce791ecfc6ff0ea175022560229c069
2022-01-07 10:10:34 +00:00
Bill Yi
4067fbe481 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0781839289
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581988

Change-Id: Ibf06eb6cd3f6157f47d33644b41201b65a608b65
2022-01-07 10:07:17 +00:00
Bill Yi
0781839289 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6c759ce3bdcd7fa8e013aa4711412db766193cbd
2022-01-07 10:07:07 +00:00
Peter_Liang
79a29303ea Add new Text and reading options preference into the a11y settings.
1. Set visible as false until completely finish the feature.
2. This preference has no action temporally, and will continually integrate features into.

Bug: 211503117
Test: manual test
Change-Id: I1404e6eca6bd8246ae844f1a287e6c4872a8fded
2022-01-07 17:22:25 +08:00
Weng Su
7865ab473e Check WiFi restrictions for WiFi QR code intent am: fe5690598c am: 0a1ef933ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16544954

Change-Id: I366a1c0a89c16b195f55a3a1fa08830f80a63ee8
2022-01-07 07:59:47 +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
TreeHugger Robot
18528bce0d Merge "Disable startup provider due to resource loading issue" 2022-01-07 06:15:13 +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
刘琼
41ed094bdc Disable startup provider due to resource loading issue
When run UT case with atest SettingsUnitTests, test failed due to
"Unable to get provider androidx.startup.InitializationProvider: android.content.res.Resources$NotFoundException".

Bug: 208883742
Test: atest SettingsUnitTests
Change-Id: I9843b01fb9d3c2a64e7b52080b2594703cee78a6
2022-01-07 12:13:56 +08:00
PETER LIANG
3907ace408 Merge "Update the preview background of the Caption and Style." 2022-01-07 03:30:43 +00:00
TreeHugger Robot
fe4d991e11 Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" 2022-01-07 02:48:14 +00:00
Bill Yi
b7d0e28589 [automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895 -s ours am: 9400843a91 -s ours am: 369598c0a2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16570397

Change-Id: I19f4d88451b64e5f6fc2bc07665ec936c30e6e8a
2022-01-07 02:43:08 +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
Bill Yi
369598c0a2 [automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895 -s ours am: 9400843a91 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16570397

Change-Id: Ic33a2e4aead117ffd3a2b05146bd68744aaa3733
2022-01-07 02:22:58 +00:00
Bill Yi
9400843a91 [automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895 -s ours
am skip reason: Merged-In I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4 with SHA-1 3387491083 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16570397

Change-Id: I4f51c80cf4e32c384afad849c04c7c6afa065767
2022-01-07 02:01:47 +00: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
b11381762e Update the preview background of the Caption and Style.
Add the background corner to be consistent with the Settings style.

Bug: 213453597
Test: manual test
Change-Id: Icf4526e13c81af9d8431304e04619d4add345aee
2022-01-06 23:58:08 +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
Giuliano Procida
97325d2305 Merge "Revert "Prevent side channel package installation enumeration"" 2022-01-06 13:28:58 +00:00
Giuliano Procida
ee8365ca8e Revert "Prevent side channel package installation enumeration"
This reverts commit 8943073514.

Reason for revert: broke tests, see b/213434244

Bug: 185477439
Bug: 213434244
Change-Id: I7a8fd6086ea59463ef73ade40663cc55b926eaca
Signed-off-by: Giuliano Procida <gprocida@google.com>
2022-01-06 13:03:22 +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
Sunny Shao
eda64c9f03 Enable scrolling to fix invisible problem of partial image
Fixes: 210362085
Test: manual test
Change-Id: Idd8e6d8f9645500090b0523f7f30a32a3140bde9
2022-01-06 20:31:34 +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
Arc Wang
18410493d4 Merge "Prevent side channel package installation enumeration" 2022-01-06 07:10:27 +00:00
Chen Xu
a1127f5996 Merge "[MEP] Use switchToSub API with pending intent" 2022-01-06 06:18:12 +00:00
Bill Yi
ea1249b895 Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
Change-Id: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
2022-01-05 21:10:49 -08:00
TreeHugger Robot
72f9e8eaf0 Merge "Add caller check to com.android.credentials.RESET" 2022-01-06 03:07:42 +00:00
Arc Wang
8943073514 Prevent side channel package installation enumeration
From Android 11, apps need the permission QUERY_ALL_PACKAGES
to probe existence of arbitrary installed packages.

However, an Activity which declares android:scheme="package
in intent-filter may be vulnerable and attacker app can
use it to probe installed packages.

This change add permission QUERY_ALL_PACKAGES to protect
vulnerable Activity.

Bug: 185477439
Test: Install POC and check if it can probe installed packages
      by each vulnerable Activity.
Change-Id: I521545436102f72f2e0c5053e30fd03bd6bc756f
2022-01-06 10:58:58 +08: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