TreeHugger Robot
eaabdee25c
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev
2022-09-28 03:05:56 +00:00
Bill Yi
dbe25724d6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-27 17:11:14 +00:00
Bill Yi
4aae182edf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6820f433e9bc4442d0dce43f543563b3797ccfd4
2022-09-23 01:03:30 -07:00
Bill Yi
c46e0e3d6e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If66addd4f08126800df1980cf1adba4cd71788e1
2022-09-23 00:58:17 -07:00
TreeHugger Robot
7c21f2eaa6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-20 23:20:11 +00:00
Bill Yi
5c3d8f340b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I985329532c210b25458142a2c0fb637056ba384e
2022-09-19 20:37:28 -07:00
Bill Yi
6a44c6afa3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3ddd1cecee3dbd09bb5fb12541666e3ec09d0b1f
2022-09-19 20:31:46 -07:00
Milton Wu
aac79b894f
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
...
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.
Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6
)
2022-09-15 07:02:13 +00:00
TreeHugger Robot
d04dc24d56
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-13 17:20:55 +00:00
Bill Yi
a4f092c748
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie871e5bb344fce432b8741e50b34954cf5fc6ec9
2022-09-11 16:28:01 -07:00
Bill Yi
f3457e4080
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iee13f8fc3f15a25a78f77111b5098b3a01d5ab8f
2022-09-11 16:23:01 -07:00
Oli Lan
9b9d0b2275
[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: ff1de3711e
-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: Ib8379f1b92400f4bd1b2b76a6c418216a44fce6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 22:18:29 +00:00
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
98f921cf42
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-04 20:35:48 +00: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
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
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
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
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
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
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
1d3e63f1ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I849b26dc45abefbb04f7b16a40b8f629805cdd78
2022-08-24 20:47:00 -07:00
TreeHugger Robot
ad78b5a675
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-23 05:47:36 +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
Oli Lan
d3938dfc4c
[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 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: Iecf56bfac38ff2dbc603a9f96f4f57add7de3a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 16:16:47 +00:00
Oli Lan
819430ed60
[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 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: Iec95e74515918dd7a9c7c0598f88031ee58682d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:58:26 +00:00
Oli Lan
141dc63796
[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 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: Ic969ff87d67009c3737c74f950966f19772f3269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:57:47 +00:00
Oli Lan
48046cf4ae
[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 skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I8dbc2b22a606856e839bcdbdc368c139df7d0b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:39:22 +00:00
Oli Lan
e2815b7e11
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I017c55ae2e7770bd52f1daca54e2aed7be05cb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:21:18 +00:00
Oli Lan
03b1a52977
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I5a78c2328f8c68fb5bf15799a69479a82b8e7af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:03:51 +00:00
Oli Lan
05031cc574
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Icfcf27040f9402b736306cf19178feee9f2a774b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 14:46:20 +00:00
Oli Lan
b9bafa0d3d
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev
2022-08-22 14:27:57 +00:00
Bill Yi
32ddcf7c21
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I39be64756b5d020673c662eb51e372997587ccc7
2022-08-22 02:18:18 -07:00
Tsung-Mao Fang
5e785a2d99
Wi-Fi panel doesn't need to check permission
...
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.
This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.
In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).
Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998
Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-17 02:43:03 +00:00
TreeHugger Robot
e91b230bac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I8d9fe810fae9f907eaaee43681b54b047c2cedf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:35 +00:00
Bill Yi
9b8d62847e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Iacfaa7a89d11000f8e5218661d404cad0e435795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:28 +00:00
Bill Yi
c64165dc4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I08ee6f10b0daff666ef0100551f50405a59f3132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:17 +00:00