PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,142 Commits 1 Branch 0 Tags
8ab6eb1be3a88c353d349bb1ef00633bac56024c
Commit Graph

104142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oli Lan
ff1de3711e [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -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/+/19745058

Change-Id: Ie0f4cc27e8ad3987f120a8c13ca033cc17972e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:54:20 +00:00
Oli Lan
7e67690072 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -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/+/19745058

Change-Id: I98a5f814012718e1a31fb7a1935715e9d7756151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:51:18 +00:00
Oli Lan
54f0522027 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -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/+/19745058

Change-Id: I1d62ca22214c2cb04c15545764864d65231d9230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:26:35 +00:00
Oli Lan
11484d510a [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -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/+/19745058

Change-Id: Ifa1eb07ec9264ea159064776d27c2fa2d2aeb1c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:24:56 +00:00
Oli Lan
52f5f2ee31 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -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/+/19745058

Change-Id: Ic7660e922a883a8147447dad898d407c4f3d387e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 20:54:43 +00:00
Oli Lan
cbf1699cd7 Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: Id74cd5fe28cec05a3fd87fc5434d28fad639e1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 20:24:55 +00:00
Oli Lan
ff5b6611cf Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: I8cc4562420648436abb478b686adb96c28d8163b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 19:39:55 +00:00
Oli Lan
05ea36ddc5 Prevent exfiltration of system files via avatar picker. am: f70e351d1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: If9321bf1035c0492396adf4ce3b6579dfe31c66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 19:01:32 +00:00
TreeHugger Robot
7cfbf2e0d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7b45a9b0171e9ec92cd776c3364c642f54f70d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:03 +00:00
Bill Yi
810c7b6e7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51da3ed71a0456683db4a027a05f85ae262c13a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:48 +00:00
Bill Yi
01a2a417e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a9aaf6ac00fa7c5ad8ce954519d9cfec5222e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:35 +00:00
TreeHugger Robot
98f921cf42 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-09-04 20:35:48 +00:00
TreeHugger Robot
cbae89efd6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-09-04 20:32:46 +00:00
Bill Yi
817a494d0e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibbc683ac8ab3e7c2489079c22fceb8ef6dd7add7
 2022-09-03 19:59:47 -07:00
Bill Yi
c798596fd5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If62421d8025fe9fc59a8805da0a21d889e56323e
 2022-09-03 19:51:44 -07:00
Bill Yi
ac6bce5228 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6127e150c61694b772d6c8a4b9fdb745ca2907bb
 2022-09-03 19:47:59 -07:00
Bill Yi
de9688841c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ice6605bdce55661c00d1190f954dc90461b9874b
 2022-09-03 19:44:44 -07:00
Bill Yi
34a6f0e456 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ed75a7a45e5c83cc9243a0a5c64274987dbf19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:22:11 +00:00
Bill Yi
ad566bfccb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5afaca68733eba118875ab8ffe8c35d71caccbd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:22:00 +00:00
Bill Yi
1eb0406eff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I885fd6af7a8d76ac440e54f3026482de588bab2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:21:46 +00:00
Bill Yi
00a98ec423 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01a66f9a0e5e1b649f31ab2ab7538e5d8b62aedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:21:32 +00:00
Bill Yi
d60d670ccc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-28 01:55:00 +00:00
Bill Yi
548e038af7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-28 01:55:00 +00:00
Bill Yi
ed96a6cb86 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-27 21:05:56 +00:00
Bill Yi
15380dd7b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-27 21:05:56 +00:00
Bonian Chen
45051bb169 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev 2022-08-27 03:58:07 +00:00
Oli Lan
f70e351d1a Prevent exfiltration of system files via avatar picker. 
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.

This is a fixed version of ag/17003629, to address b/239513606.

Bug: 187702830
Test: build and check functionality
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
Change-Id: I98eea867f926c508456ec9bc654e24eeeffa0e54
 2022-08-26 19:46:02 +01:00
TreeHugger Robot
c006955815 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b05ab7b867f2acb4b71038db45864e69ce28d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:53 +00:00
Bill Yi
58ea31040c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c6697a911ebd5b1cc0dea82c85e82f009919803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:40 +00:00
Bill Yi
7a3ffa65cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb18a7c53c6222bf52f71b26ab064c9f2547b9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:29 +00:00
TreeHugger Robot
2810928518 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75db89938d39c6c1c576a31ecbd8d5bf7868991d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:47:08 +00:00
Bill Yi
c9ac950159 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48e41e88032dfe727058fbce95de2efaf618757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:46:49 +00:00
Bill Yi
bfd43e8459 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0bbb18017f81853c962c6cb34ee6eabaf9e619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:46:35 +00:00
TreeHugger Robot
ecbf9be9a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-26 17:25:46 +00:00
Bonian Chen
8c6c1ca236 [Settings] Not allow APN delete when adding is not an option 
When not allowing APN to add, user may not be able to recover easily
when delete it.

Therefore, avoid from APN to be deleted when adding is not allowed.

Bug: 243664439
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
 2022-08-26 08:52:42 +00:00
Bill Yi
4e5669b82f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie7ff28b6cf65231bab7757ae9c5c9bf1bee9f475
 2022-08-25 08:40:29 -07:00
Bill Yi
6ccb75281f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I222a6fa89b2ba5da975e473b52c7ebb70e5e607f
 2022-08-25 08:36:52 -07:00
Bill Yi
6577aa89b6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7db8155cb74847cc3a16d49793c7018b2d3c6e77
 2022-08-24 21:02:51 -07:00
Bill Yi
f9bf84d822 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I022fac7bfc51decd6c42007534917453acf4b7cf
 2022-08-24 20:54:14 -07:00
Bill Yi
631dfab65d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I69bb22cae943842b51980d5fe875e14033930a1e
 2022-08-24 20:50:20 -07:00
Bill Yi
1d3e63f1ab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I849b26dc45abefbb04f7b16a40b8f629805cdd78
 2022-08-24 20:47:00 -07:00
Bill Yi
1be27e97c5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-23 13:56:32 +00:00
Bill Yi
1a3d6c47c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-23 13:56:32 +00:00
TreeHugger Robot
4f819e1516 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa6359f18e9ab1bc55e1b98b25d634b893ff4cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:12:41 +00:00
Bill Yi
f8f3b752ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e8b27c3967b6a51860cb17f7da2ec6f5f53c4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:12:23 +00:00
TreeHugger Robot
ad78b5a675 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-23 05:47:36 +00:00
Oli Lan
80cdde7ce8 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic216159568b50b5e42fd19f762fe16b83f3de50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:34:53 +00:00
Oli Lan
da927d5a6b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I81a86c60b0b2a352d6b326864a2e5a8eee53ca98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:34:43 +00:00
Oli Lan
bb562d7426 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I07b0906b78784d42784afcc982973e916517b479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:17 +00:00
Oli Lan
40ec6382a0 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I4db81a26ef2ede09401e576c6fc5afeb57d48291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:16:49 +00:00