Commit Graph

85960 Commits

Author SHA1 Message Date
lucaslin
52e863b5a2 Hide private DNS settings UI in Guest mode
Hide private DNS settings UI in Guest mode to prevent guest
users modifying global private DNS settings.

Bug: 206987762
Test: 1. make RunSettingsRoboTests \
         ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
      2. Switch to Guest user and check if the private DNS UI is
         hidden or not.
Change-Id: Iebfb8684da3be32110decd9e8447dd07b1c40387
2022-03-09 02:54:12 +00:00
Presubmit Automerger Backend
407022ff92 [automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Bug: 201519976
Change-Id: Id4e717096e077e2940a0d99e01448f3b1213d532
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:39 +00:00
Alex Johnston
bc4fd99ddb Change default USB configuration to a RestrictedPreference
Test: manual with TestDPC and Settings
      DefaultUsbConfigurationPreferenceControllerTest
Bug: 201519976
     205996517
Change-Id: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:18 +00:00
Oli Lan
8950a90024 Prevent exfiltration of system files via user image settings.
This is a backport of ag/17005706.

This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.

The mitigations are:

1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.

2) Only allow a system handler to respond to the CROP intent.

Bug: 187702830
Test: build and check functionality
Change-Id: Ia6314b6810afb5efa0329f3eeaee9ccfff791966
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2022-03-03 13:18:16 +00:00
TreeHugger Robot
57ff9d215e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
  Import translations. DO NOT MERGE ANYWHERE
2022-03-03 09:26:19 +00:00
Bill Yi
651ff7ece6 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
Blank merge reason: commit message contains skip directive

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

Change-Id: I6024ef9c60c715a2bd283a73e9f40b86803c85ae
2022-03-02 16:24:58 +00:00
Bill Yi
2ba7f57217 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If35ec49c403221a9c6079cf4b4e60ffddbfd5f2e
2022-03-02 16:24:43 +00:00
Bill Yi
11683d653b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibb99c8c427c1bd2e4338fd2301568e4ce63a5b1e
2022-03-02 16:04:10 +00:00
TreeHugger Robot
24bd47eda7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-02-24 18:00:29 +00:00
Bill Yi
85de1c63a0 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
Blank merge reason: commit message contains skip directive

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

Change-Id: I4b42132461ed189087af72cbd7e2d4b5fdee7655
2022-02-23 08:21:08 +00:00
Bill Yi
b07f4eca84 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icf0bc906bc6e41539af9fa4200ec6fe24d559b0f
2022-02-23 08:20:54 +00:00
Bill Yi
f3ce34203a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I359d7ac2de90ff5b5096ee70f30c00c20e2ccebe
2022-02-23 08:06:38 +00:00
TreeHugger Robot
2555e0d2e3 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
  Import translations. DO NOT MERGE ANYWHERE
2022-02-18 17:09:14 +00:00
Bill Yi
8e58f10261 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
Blank merge reason: commit message contains skip directive

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

Change-Id: I7662c7037845f69e2008060f7e654656c6675194
2022-02-18 03:13:47 +00:00
Bill Yi
bfb1c0090c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3127e1d696f00a9d496edaa5ed672ac1820da936
2022-02-18 03:13:28 +00:00
Bill Yi
41068978bb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ief2faf3cb2373cc20904d546c356b46570551ddf
2022-02-18 02:58:19 +00:00
Jack Yu
93bb6265de [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I1aeb78925da456f0b112ef60a7b5d3c6fc51aea2
2022-02-08 03:10:51 +00:00
Jack Yu
5163fd7aea [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: Ie7899cd8137c524e3fd39a0b50016fbae5d37120
2022-02-08 02:59:06 +00:00
Jack Yu
7093dea7f7 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I186c750238d8f159b2d33e309c2aa9badf60ff64
2022-02-08 02:43:45 +00:00
Jack Yu
cd6ce52ea4 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: Ief5899b4af766d3d1c9283e4a5a4500ff66b9009
2022-02-08 02:30:37 +00:00
Jack Yu
46bd9ba5a5 Do not let guest user disable secure nfc am: 4e543a38f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813

Change-Id: Iffe578c58bf2dcebda45b0b71dd901bd3e08be41
2022-02-08 02:15:55 +00:00
Bill Yi
2e5004e48c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ae1f5b9196148fdff2b5410dc81c0940fa63427
2022-02-05 08:25:54 +00:00
Jack Yu
4e543a38f6 Do not let guest user disable secure nfc
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1)
2022-02-02 17:44:55 +00:00
Jack Yu
7236467bb5 Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: I1babb5ca315f09d9602dd1b35ed2e2ccf032feb9
2022-01-28 22:48:44 +00:00
Jack Yu
b85416796d Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: I9879ba034ae2b8d7a964a4d6c9d700bad55b636e
2022-01-28 22:31:38 +00:00
Jack Yu
1009054124 Do not let guest user disable secure nfc am: a579ca7554
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: Ic68c6849bb65875aea6286d415c66ae8a9f57dfa
2022-01-28 22:19:10 +00:00
Bill Yi
d326cb4ae3 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
  Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00
Bill Yi
c09b5ba58d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie58b5d18d82912aa129715db7a7480aa523b3326
2022-01-25 06:25:53 +00:00
Bill Yi
e4ca28a0d0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I09e6df9ed565dcd098d1b1a98c51786fe5d87785
2022-01-25 06:25:43 +00:00
Bill Yi
abf6fc3cde Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ea0d5d717a9d1126b53b41d5461ce43cbc3e868
2022-01-25 06:11:20 +00:00
Jack Yu
a579ca7554 Do not let guest user disable secure nfc
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1)
2022-01-22 07:56:25 +00:00
TreeHugger Robot
9b153e3bd4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-01-15 19:45:22 +00:00
TreeHugger Robot
1f889d54e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I302cb85c51e48fcf9b5bfb04aee10cbf1f7d0979
2022-01-14 18:33:11 +00:00
Bill Yi
1179a58d9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48d29a773ac44e8dca5917ba7e49e9cb7cf9c7dd
2022-01-14 18:31:29 +00:00
TreeHugger Robot
572b59c465 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-14 18:09:51 +00:00
Bill Yi
a6f38c19f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib7868c5698aef46813818165545a388552033564
2022-01-14 09:18:54 +00:00
Bill Yi
3bf676d7ce Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic57de1e9085d2e5ebc2a4eaaa38bdcbc1af70090
2022-01-14 09:09:42 +00:00
Bill Yi
309dfa85f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I14169aab5b628d8559680f553d43488f98a3e61b
2022-01-14 09:05:29 +00:00
Bill Yi
1ec6a5c572 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I25e71adccb1ccbdad52e5c659c22708388010c70
2022-01-14 09:01:53 +00:00
TreeHugger Robot
a4f683f53e [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I115e726c34bef7c2c763c55f12e3af244527e449
2022-01-13 22:00:54 +00:00
TreeHugger Robot
8a91ea7add [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: If02ad441dd23232075e4fbe9b1927e795aed175e
2022-01-13 21:43:35 +00:00
TreeHugger Robot
3c427d1702 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I4c7244679855404fd5842d0e3e7ab407a6d07f4f
2022-01-13 21:36:49 +00:00
TreeHugger Robot
616aecf1ec [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Iacff1f7f942431bba6f09a9f500a8e60ea394824
2022-01-13 21:25:16 +00:00
TreeHugger Robot
97729a9e16 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I0c4662c0cda74c28d2385ade52a345e84086bbc9
2022-01-13 21:06:55 +00:00
TreeHugger Robot
02a19ec59d [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I34d7fec987c297fbb846888d9cf187d0a0f7321c
2022-01-13 21:06:50 +00:00
TreeHugger Robot
3f6a48a552 Merge "Add caller check to com.android.credentials.RESET" into rvc-dev 2022-01-13 20:43:35 +00:00
TreeHugger Robot
5f960a59ba [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I6d2a2287357037a96d9b9c1fbb7d012a0d19effc
2022-01-13 20:30:55 +00:00
TreeHugger Robot
b04e0ab405 Merge "Add caller check to com.android.credentials.RESET" into sc-dev 2022-01-13 20:19:00 +00:00
TreeHugger Robot
f61e4e04c8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I79f941fe262a0f9177ab8f9d3b3c4cef751ec0af
2022-01-13 19:59:57 +00:00
TreeHugger Robot
e7ca4bcfb7 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I9b5f7003ce9011b941dfaf3325df2985daf6e012
2022-01-13 19:59:48 +00:00