Arc Wang
f0065e3adf
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
am: 3d9bdda678
-s ours am: ec921eea1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Iabdde708e9eb3a24bc2419bf34587cd3f8c23e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 01:08:52 +00:00
Arc Wang
ec921eea1a
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
am: 3d9bdda678
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Icdb07124a1e56fcde6643776e786a91095ac8d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:42:03 +00:00
Arc Wang
3d9bdda678
[DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Id9e9e4b50fc12780f71aad93666fbbf24f4d6429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:24:04 +00:00
Arc Wang
d47388ce79
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551
-s ours
...
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 4b02b7dc7d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: Ib21fa93721b604e338d7a37add094e28e65ee4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:23:46 +00:00
Arc Wang
640eab60f2
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:43:16 +00:00
Arc Wang
4b02b7dc7d
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:42:41 +00:00
Arc Wang
1682354551
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:42:05 +00:00
Bill Yi
1836db16f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I99d69b8e647e305a479b153fc02214669d1a2afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:29:38 +00:00
Bill Yi
d75e8abee9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I4c0e9c3e7134386a49cfaa8271c9a109f2c55d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:04:25 +00:00
Bill Yi
5e07d7fd84
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I048fe580663c03d27cae41e605f9d6719507e0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 21:28:28 +00:00
Bill Yi
223d9c81f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: Iee353b944bfcf19af8b5333daa0dfcfcbaa85cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 21:26:16 +00:00
Bill Yi
42c15dc26c
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: Ie80b96d07d3e8bd2c55b86e0af83bdb6a418b3fc
2022-04-28 18:43:59 +00:00
Bill Yi
ac6b0bdef6
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I669099ad00ba7d90013836e3d456d530ae725b2f
2022-04-28 18:39:25 +00:00
Bill Yi
392df50da0
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I67386b7749b6575747c0507e3841fa404c6a69f4
2022-04-28 18:23:10 +00:00
Edgar Wang
9a206c5870
Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
am: 9562e2e011
am: 7541d3495f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674
Change-Id: Ie6d6192a880c6f6fa26a4374be7c6281ef70ada9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 03:22:14 +00:00
Edgar Wang
7541d3495f
Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
am: 9562e2e011
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674
Change-Id: I20b4dbcd149a796e0c56657403d30d6f31d3274c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 03:01:15 +00:00
Edgar Wang
9562e2e011
Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674
Change-Id: Ib3c3ca64de6e099b2e2fde18abd35feb3412878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:47:48 +00:00
Edgar Wang
03d36d79d6
Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675
Change-Id: Ice72452717b8ca2edd68a01ba103b33cc7b12fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:47:40 +00:00
Edgar Wang
1b9da55a31
Fix LaunchAnyWhere in AppRestrictionsFragment
...
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.
Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3
)
2022-04-13 04:49:26 +00:00
Edgar Wang
aeb36e5c28
Fix LaunchAnyWhere in AppRestrictionsFragment
...
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.
Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3
)
2022-04-13 04:48:46 +00:00
Edgar Wang
b3eecdd13d
Fix LaunchAnyWhere in AppRestrictionsFragment
...
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.
Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3
)
2022-04-13 04:47:24 +00:00
Arc Wang
3fc5b81efe
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628099
Change-Id: Ied0f1e36a2d67fa9681f60c89ce0748af48148b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 01:50:59 +00:00
Arc Wang
4bf19c2271
[automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628099
Change-Id: Ib0ff605c1ed18d9053248dace8087fab90c3234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 01:50:58 +00:00
Arc Wang
91481f8a1f
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev
2022-04-08 01:19:01 +00:00
Arc Wang
346ab35fc4
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: If996f3775f8de7981af3409129d8d5254b470b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:05:45 +00:00
Arc Wang
e5e271bfed
Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: Id6820351a67c2b2924a9a6ee3a06731519510ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:44:36 +00:00
Arc Wang
21a0db9882
Hide non-system overlay window on ActivityPicker am: c4121c15e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I54645a67488b6c155218eca6c5fb5779daabd495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:15:23 +00:00
Arc Wang
c4121c15e4
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:44:12 +00:00
Arc Wang
d10662cf97
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:42:30 +00:00
Arc Wang
c55b5b54d2
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:42:02 +00:00
Bonian Chen
8c89ac9027
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours am: 961d4b26b7
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I38b41e693d544fa9b44323f3b9d1d7a6c53690ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:15:26 +00:00
Bonian Chen
961d4b26b7
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I50b0f293bc021fe8f28fb1f10cb20bc93c75bcf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:39 +00:00
Bonian Chen
d35d3e2446
Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: Iabf1f3d5b113e12ddfd1cfe1037a94fb4509e180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:23:16 +00:00
Bonian Chen
e8097d4464
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974
Change-Id: Id3bd26debfc50e0b332695ffaf9f1fe1aca51feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:22:44 +00:00
Bonian Chen
eefa7371ed
[automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974
Change-Id: Ide4d80dc46e692c7664010e6ab2746be482dff5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:22:43 +00:00
Bonian Chen
6279d80f93
Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev
2022-04-07 00:08:23 +00:00
Bonian Chen
d0d67e68a5
Merge "[Settings] Move display of VPN version into summary text" into rvc-dev
2022-04-07 00:08:16 +00:00
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
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
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
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
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