Commit 16291a3d authored Jun 03, 2023 by Pranav Madapurmath

[conflict] Resolve StatusHints image exploit across user. am: 49d19dd2 am: 2a10deb1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23438951



Fixes: 285650146
Fixes: 280797684
Change-Id: Icf8d87d43bd5fd3c23f317de52d7f18e2748f6a1
Merged-In: Ie1f6a8866d31d5f1099dd0630cf8e9ee782d389c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents feb31d54 2a10deb1

Show whitespace changes

Inline Side-by-side

/e/ robot @erobot
mentioned in commit 09bd0414
· Oct 08, 2023

mentioned in commit 09bd0414

mentioned in commit 09bd04141f8cac26b231a36aba53dd1dfb9048dd

Toggle commit list
/e/ robot @erobot
mentioned in commit 27237c85
· Oct 08, 2023

mentioned in commit 27237c85

mentioned in commit 27237c8599f0a9c1575bab369db048f36ea44488

Toggle commit list
/e/ robot @erobot
mentioned in commit a33d2395
· Oct 08, 2023

mentioned in commit a33d2395

mentioned in commit a33d2395b7f29b7406967bb1e734153103ad5859

Toggle commit list
/e/ robot @erobot
mentioned in commit b97d97a3
· Oct 08, 2023

mentioned in commit b97d97a3

mentioned in commit b97d97a3afb8d675e77b4e82cb031c40bc060751

Toggle commit list
/e/ robot @erobot
mentioned in commit ba097705
· Oct 08, 2023

mentioned in commit ba097705

mentioned in commit ba097705c62b715e83fa398a512029e11ed30ede

Toggle commit list
/e/ robot @erobot
mentioned in commit bc121551
· Oct 08, 2023

mentioned in commit bc121551

mentioned in commit bc12155190633b4ab93f9cf9007e6d9ee9e1c11a

Toggle commit list
/e/ robot @erobot
mentioned in commit a54a91e7
· Oct 08, 2023

mentioned in commit a54a91e7

mentioned in commit a54a91e79d60593b990020c4de67c2785107eb2a

Toggle commit list
/e/ robot @erobot
mentioned in commit 25562eda
· Oct 08, 2023

mentioned in commit 25562eda

mentioned in commit 25562edac0ce39e998689bbb02d78c13ab0022bd

Toggle commit list

Please register or to comment