PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,115 Commits 1 Branch 0 Tags
1b012c577a2b108e2894aa0cbf9e15cf11d7670c
Commit Graph

84115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
d0888970a4 Merge "[Settings] Move display of VPN version into summary text" into qt-dev 2022-04-07 00:08:08 +00:00
TreeHugger Robot
8eacc8a8dc [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I8a0e31ec51c4a133b2f4842d47f818461f9e712b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:27:04 +00:00
TreeHugger Robot
7bd23716c3 [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I3f91cd3600b1b581beac0b262a35cbf66fed209e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:03:28 +00:00
TreeHugger Robot
0b507f0203 [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383

Change-Id: I03622a4803112de1f7b2f2fb3000b007444bc19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 17:48:29 +00:00
TreeHugger Robot
ed29b05dcd [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629

Change-Id: I8bba0ed0611a7cef34b210e7e7553de70dbf9aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2022-04-01 16:13:50 +00:00
TreeHugger Robot
e6e739d8b0 Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629

Change-Id: I5ebae8947d883130b93c9a82d087656dab41498a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 12:58:31 +00:00
TreeHugger Robot
74ff164972 Merge "Prevent exfiltration of system files via user image settings." into qt-dev 2022-04-01 12:42:31 +00:00
Weng Su
a30d123e12 Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: I4d1bf49f4eab2ce72148cd308b5c217d814ab75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:11:32 +00:00
Weng Su
4c4a1f58c1 Restrict secondary users to share Wi-Fi network 
- Remove "Share" and "Forget" options from the long press menu

- Add SafetyNet Logging for security report

Bug: 206986392
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ic434f0583cba557228c72508a501347ffa3141e1
Merged-In: Ic434f0583cba557228c72508a501347ffa3141e1
 2022-03-28 03:15:18 +08:00
TreeHugger Robot
734d949527 [automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I35974d0cea6185fac6225093e59b8d0bc65516c0
 2022-03-09 18:11:59 +00:00
TreeHugger Robot
f48ae98972 Merge "Change default USB configuration to a RestrictedPreference" into sc-dev 2022-03-09 17:54:27 +00:00
TreeHugger Robot
7b40a559bf Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev 
* changes:
  [automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
  Change default USB configuration to a RestrictedPreference
 2022-03-09 17:54:27 +00:00
lucaslin
92245b8f57 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I6947b1c6fb64bf4603ee665ebc44d53fb8f8b77d
 2022-03-09 07:44:37 +00:00
lucaslin
b38110f853 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I7dfbfc73a887027bb55712e2ea05fd01e65bcf96
 2022-03-09 07:20:30 +00:00
lucaslin
652527b496 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I8d31577fb64d959949b1c2aed51e482cb54a57ac
 2022-03-09 06:55:34 +00:00
lucaslin
14e88ca2f9 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I417c9687ae22749f428a902a01612c50cbf0e52c
 2022-03-09 06:32:20 +00:00
lucaslin
2c1c76cd35 Hide private DNS settings UI in Guest mode am: 52e863b5a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I5fc7b5001299b8831a1dd9440b6e25dfaf6d8a98
 2022-03-09 06:08:16 +00:00
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
15d0cfed3a [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: I308c520fe768dcfc1276c125e05c4203b39be2c7
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
 2022-03-08 16:10:38 +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
Bill Yi
40e23845e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife884fc14969c0babdd6948edff1781a75e6cfb6
 2022-03-03 10:08:18 +00:00
Bill Yi
a9e8ee6e40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id83f405b8b044af0e5fd33278109d7a656b9ecc1
 2022-03-02 16:28:16 +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
TreeHugger Robot
a18ff15076 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-24 18:05:30 +00:00
Bill Yi
fc83e2a05a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If758b66584626c3d33a0be4982d4cb5ed55e4687
 2022-02-23 08:24:25 +00:00
Bill Yi
3913e56dd9 [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: Idd1873b76e7931f2fc0befd3b34dea0acf7fe1cb
 2022-02-23 08:21:07 +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
TreeHugger Robot
1c5ae8a124 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-18 17:09:16 +00:00
Bill Yi
b3c81561c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I97f82f3f3ab3ac037a2b28c4e0c0db21398a605c
 2022-02-18 03:17:09 +00:00
Bill Yi
382229bcb6 [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: I1b36efd22b8f9c8af9ceeca44656c53010349444
 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
Jack Yu
b3762ca5f4 [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: I8654c830eaebe72d6f84f8966c43ea74979b14af
 2022-02-08 03:12:04 +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
e7f361b3cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I66e97246a1e7cccda15c563a0001127629a0b684
 2022-02-05 08:43:36 +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
05dfb08c80 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: I72ccad504b36bd1112660cc180be93c210ae66c4
 2022-01-28 22:53:00 +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
7793bd6b17 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev 
* 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
4dab10d29f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic26c56697a7c78fde677f39f63562fa8327d4b2d
 2022-01-25 06:29:10 +00:00
Bill Yi
86cab2cd66 [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: If1bb4c3824bdba9640309da80b4b7168b32076f3
 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
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
e7e23fad18 [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: I2e677ef2a2c919b027b8c565e6b01be47d4724f4
 2022-01-14 18:34:27 +00:00
Bill Yi
bbf27131c6 [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: I36a0e9655821f97c5fade9d1890c3987202db953
 2022-01-14 18:33:17 +00:00
TreeHugger Robot
572b59c465 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-14 18:09:51 +00:00