Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
771,034 Commits 3 Branches 0 Tags
3ffc423fe2f5fc286285ce37fa1d1b9cdeddcc7a
Commit Graph

8503 Commits

Author SHA1 Message Date
Bill Yi
3ffc423fe2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I65152691a7820aecd21568ef6911a39c6a1be57b
 2022-09-23 00:30:14 -07:00
Bill Yi
3423fea185 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8df9ba4642ad8b3dc9113e33ab3ed780dd47210f
 2022-09-19 20:02:57 -07:00
TreeHugger Robot
3a01e1a308 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-09-13 16:53:33 +00:00
Oli Lan
c54c704113 Merge "Prevent exfiltration of system files via avatar picker." into tm-dev am: 5489aa365f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19754655

Change-Id: I6ecc86032e6871d6e2cec55b61533121c1567daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 14:01:49 +00:00
Oli Lan
5489aa365f Merge "Prevent exfiltration of system files via avatar picker." into tm-dev 2022-09-13 13:36:44 +00:00
Bill Yi
09b3489907 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I09f5e396a86fa492fe964a8ea3911e80c79d7110
 2022-09-11 15:56:44 -07:00
TreeHugger Robot
52f3a68fcd Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev am: 95e397a8b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19436694

Change-Id: Id0c46913c70785ecbf90b9f4d6c4a4e3b1270298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 17:09:07 +00:00
TreeHugger Robot
95e397a8b8 Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev 2022-09-08 16:35:29 +00:00
Bill Yi
89bcb9d21d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2bc3f0caa0f4861174c27694267a7f5347ad35bf
 2022-09-03 19:12:12 -07:00
Bill Yi
23362ff815 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie25f629b750f6d1e4c72c24aa1329a5bf3afb62a
 2022-09-03 19:08:50 -07:00
Bill Yi
31dc2a2023 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-28 01:55:00 +00:00
TreeHugger Robot
6757612a9d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-27 08:11:48 +00:00
Oli Lan
b76141eb2b 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/17005706, to address b/239513606.

Bug: 187702830
Test: atest AvatarPhotoControllerTest
Change-Id: I21f1b25154dc00a305bdadb96fdf22edff31d9b8
 2022-08-26 15:37:12 +01:00
Oli Lan
f18aa11dd5 Revert "Prevent exfiltration of system files via avatar picker." 
This reverts commit 1325574d3a.

Reason for revert: regression if multiple crop system crop handlers are present

Test: atest AvatarPhotoControllerTest
Change-Id: I4dac3ac8d27d2b6d664614dcfa9488d2dad7ee7d
 2022-08-25 18:10:32 +01:00
Bill Yi
c2b20250b0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18f13d67bbac5702b6548772acb6e61ce8018a4f
 2022-08-24 20:11:57 -07:00
Bill Yi
10dcd48c2a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ef8154c5eca2847d21e3e842119a9a0d4345a78
 2022-08-24 20:06:26 -07:00
Bill Yi
5362a9d5ff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icaac34c52d01d79c67f5f88d3b91b4d48d531d79
 2022-08-24 19:58:04 -07:00
Bill Yi
0557672b4d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I415728d77f734fac9178c972955e225f1181e1bb
 2022-08-24 19:56:18 -07:00
Bill Yi
fa68238395 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a004cfdb8beabe5dff0ac00b100d9c6e8410c0a
 2022-08-22 01:46:51 -07:00
Bill Yi
e80c68ca8d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If08d9ef5dca76536312e560a91ad103db901669a
 2022-08-22 01:43:07 -07:00
Bill Yi
b8562471df Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaee5bafd6505453d7fb6b8656a2271f26475303a
 2022-08-11 15:39:01 -07:00
Bill Yi
c142d28561 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5ceec48c250cd50bbadf45d4bc71359e4057c853
 2022-08-04 00:34:46 -07:00
Bill Yi
cf82ef8758 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I724dea6b7d9f463ba50085939f763b449d3ad32d
 2022-08-04 00:26:24 -07:00
TreeHugger Robot
b739f99ccf Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-07-23 00:36:04 +00:00
Bill Yi
4788ff3851 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I86836fc03bcbbf64d5b582974e78bc3266d1d3a4
 2022-07-21 22:22:22 -07:00
Bill Yi
edc100ce5c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I452cdfbf78416a8691dd626493879ce10a2704d6
 2022-07-21 22:16:04 -07:00
Albert Kong
05c7a58408 Allowing libraries for styling the Privacy Sandbox Beta app. 
Test: manual
Bug: 239428231
Change-Id: Iead479f53488a642a3f5ab69b9b19acf24017039
 2022-07-20 16:33:48 +00:00
Bill Yi
e3512e0916 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d896713991694852697e60866798a35fceb66af
 2022-07-14 12:35:02 -07:00
Bill Yi
3d6fa95327 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If1754467badc76bf9ff71131054a9650f110766e
 2022-07-14 12:27:28 -07:00
Bill Yi
d17e368b24 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f5ec9a296c88e6af1174658199dd8f53f1cef12
 2022-07-04 11:06:20 -07:00
Bill Yi
54a172f225 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3884607075a31b5191cc1010c7ff987df2194536
 2022-06-30 02:00:22 -07:00
Shaowei Shen
b0fe0e98e9 Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev am: 82c3268cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18911999

Change-Id: I345863b0f3d98d96db291d02229009eb66c64899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 08:29:20 +00:00
shaoweishen
84d0224973 [Output Switcher] Use Thread-safe list to store mediaDevices in 
MediaManager

Test: build pass
Bug: 235183673
Change-Id: Ic00c1085f3ddc3c9bf68815a4ef96a5f1391556c
 2022-06-22 01:11:57 +00:00
Bill Yi
b64a3ff094 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I38cff891251775ee3483482716123dc158c3c44d
 2022-06-18 18:14:09 -07:00
Bill Yi
03edacd380 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I29356d9c7a3c47bd3bf364f4882d78f14a2f0cad
 2022-06-18 18:06:48 -07:00
Albert Kong
72a717838c Merge "Adding action bar & styles to AdService Settings." into tm-mainline-prod 2022-06-14 17:24:18 +00:00
TreeHugger Robot
2a0153c71b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-13 16:43:58 +00:00
TreeHugger Robot
228abd9f2f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-13 16:37:20 +00:00
Shaowei Shen
f806c1ccfc Merge "[Output Switcher] Disable volume control if route is volume_fixed" into tm-dev am: 25639f1b6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756771

Change-Id: If41c79934eba74a85b9fca0ebe82de7d210a15c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 10:20:20 +00:00
Shaowei Shen
25639f1b6d Merge "[Output Switcher] Disable volume control if route is volume_fixed" into tm-dev 2022-06-13 09:57:25 +00:00
Bill Yi
e99e2b2afc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id70933a8839536bb8cf9c30bfaaed4fe843a9b3a
 2022-06-11 12:12:28 -07:00
Bill Yi
711256b65a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id2e2d1e5793cf8636855f602979dd357c24729c2
 2022-06-11 12:04:26 -07:00
TreeHugger Robot
dd178ea434 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-10 06:47:11 +00:00
TreeHugger Robot
d8e20e698b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-10 06:08:45 +00:00
Shaowei Shen
896f31e154 Merge "[Output Switcher] Handle muting expected device" into tm-dev am: 1ad9256245 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18610067

Change-Id: Ic47715683b5a8d044ff96b10a1617a607b49ced4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 04:06:36 +00:00
shaoweishen
675bc7bf5b [Output Switcher] Disable volume control if route is volume_fixed 
Bug: 233953128
Test: verified on device
Change-Id: Ibb73b62b24cb3070e15854c5bfa08987e7d226da
 2022-06-10 03:45:58 +00:00
Shaowei Shen
1ad9256245 Merge "[Output Switcher] Handle muting expected device" into tm-dev 2022-06-10 03:44:58 +00:00
Bill Yi
5552a875f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I372c1935afdd744c5094edcebf23cf1f4f0b398d
 2022-06-09 09:27:14 -07:00
Bill Yi
5b16e72c15 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic050a684e9899c2b0f50141faebd9d7672c494ac
 2022-06-09 09:23:38 -07:00
Albert Kong
c06ad0ec5c Adding action bar & styles to AdService Settings. 
Test: Manually built and flashed app.
Bug: 231982352

Change-Id: I5909e5d3176f8ba762c9d211161f35a778ad2320
Merged-In: I63d9eb74ce1a0d514ffc956a81b1682ea7c7fac4
(cherry picked from commit 1f7ece3aec)
 2022-06-09 15:32:54 +00:00