Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
765,918 Commits 3 Branches 0 Tags
1d32ff85a491ec983d03401eb752fe679b694d31
Commit Graph

765918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean Chalard
1d32ff85a4 Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab574 am: 749b03d2e6 am: f39900d8b2 am: 92a9270571 am: 00b4d82125 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20460002

Change-Id: I2d4398200ed7fe67f0670a12d534b4d438e5aa9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 08:32:23 +00:00
Jean Chalard
00b4d82125 Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab574 am: 749b03d2e6 am: f39900d8b2 am: 92a9270571 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20460002

Change-Id: I59d7cc1e80693986706902f64885f36941d7717c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 07:58:07 +00:00
Jean Chalard
92a9270571 Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab574 am: 749b03d2e6 am: f39900d8b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20460002

Change-Id: I721b03954c19d624d47a9fb1d78ddb429d6d18d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 07:20:41 +00:00
Jean Chalard
f39900d8b2 Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab574 am: 749b03d2e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20460002

Change-Id: I478ceaee4acd56bc994f3bc5f2a92cd5a9babfd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 06:42:16 +00:00
Jean Chalard
749b03d2e6 Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20460002

Change-Id: Id679bb24798cc732bd1cd5d6abefb08bcf552a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 06:03:59 +00:00
Jean Chalard
230c7ab574 Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev 2023-03-20 05:22:22 +00:00
Treehugger Robot
f8ba53d9c9 Merge "Add Toast#show() specific javadoc" into android13-tests-dev am: 1d8b567ae1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2477605

Change-Id: I0df3d37f69a0876d166e341a7fb7affe25777edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 19:21:16 +00:00
Treehugger Robot
1d8b567ae1 Merge "Add Toast#show() specific javadoc" into android13-tests-dev 2023-03-16 18:44:23 +00:00
Liana Kazanova
b0ca1b2dd6 Merge "Ignore testShowHideInSameFrame on T" into tm-dev 2023-03-14 18:56:49 +00:00
Oli Lan
d28c0aa62d Merge "Validate package name passed to setApplicationRestrictions. (Reland)" into tm-dev 2023-03-14 17:08:23 +00:00
Iavor-Valentin Iftime
54439081f1 Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into tm-dev 2023-03-14 10:00:01 +00:00
Kohsuke Yatoh
80096c5dc0 Ignore testShowHideInSameFrame on T 
ImeOpenCloseStressTest#testShowHideInSameFrame() is very flaky
on T. It's passing on T QPR, and rewritten in U (also passing).

This could be a real bug on Android side as the same test is passing on
T QPR. However, let's just ignore this test as T (not QPR) does not
accept general fix now.

I7a66fd84e4094be249714c2597706ee25938adbe is an unrelated change that's in T QPR to avoid merging this CL there.

Bug: 268556567
Test: m InputMethodStressTest
Change-Id: Ibcd01e0d722f5ebb846e75f72ba4e770f7030d32
Merged-In: I7a66fd84e4094be249714c2597706ee25938adbe
 2023-03-14 03:01:18 +00:00
TreeHugger Robot
83576b6a74 [automerger skipped] Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into sc-dev am: 1e43a7a21b -s ours am: 902f48fc36 -s ours am: 0e64b52665 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610895

Change-Id: I31beb8de2e72dee18bafc89a25dce2af0a70d9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:35:30 +00:00
Valentin Iftime
7665e91ac4 [automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: b9cd15ad8a -s ours am: 0e635c3365 -s ours am: 81ca346eb6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610895

Change-Id: I03f1064d320b40dfe65b6708bf3b57ac7eae4a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:35:07 +00:00
Valentin Iftime
99870fbd81 [automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: 733089e71c am: 80c5f50d2c -s ours am: cb98f26026 -s ours am: f02f563376 -s ours am: 63b051e1a9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609150

Change-Id: Ieef2cfbaa8e4c8989f8ac04d27936578f0d51ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:34:08 +00:00
TreeHugger Robot
0e64b52665 [automerger skipped] Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into sc-dev am: 1e43a7a21b -s ours am: 902f48fc36 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610895

Change-Id: I0990061a0c462e97dd782b1702dde8bcc38e9bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:02:13 +00:00
Valentin Iftime
81ca346eb6 [automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: b9cd15ad8a -s ours am: 0e635c3365 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610895

Change-Id: Id584538afbff75ba380b345b82817d2de68313a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:02:08 +00:00
Valentin Iftime
63b051e1a9 [automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: 733089e71c am: 80c5f50d2c -s ours am: cb98f26026 -s ours am: f02f563376 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609150

Change-Id: Id321b77793c7adc16177c3f0863a9c5d42a22b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:01:49 +00:00
TreeHugger Robot
902f48fc36 [automerger skipped] Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into sc-dev am: 1e43a7a21b -s ours 
am skip reason: Merged-In I341db60223214cf2282b5c0270e343e1ce95fa01 with SHA-1 733089e71c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610895

Change-Id: If167376ad6aa485e38e8fd1457c20a1fecb77742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:05:34 +00:00
Valentin Iftime
0e635c3365 [automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: b9cd15ad8a -s ours 
am skip reason: Merged-In I341db60223214cf2282b5c0270e343e1ce95fa01 with SHA-1 733089e71c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610895

Change-Id: I4a21e05753e45c25c3cba577ef315f4d0ffdb155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:05:20 +00:00
Valentin Iftime
f02f563376 [automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: 733089e71c am: 80c5f50d2c -s ours am: cb98f26026 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609150

Change-Id: If153cf17cef331a39e93116557c66a9f98464590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:04:43 +00:00
TreeHugger Robot
1e43a7a21b Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into sc-dev 2023-03-13 18:58:51 +00:00
Valentin Iftime
cb98f26026 [automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: 733089e71c am: 80c5f50d2c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609150

Change-Id: I50c27f973746a00ccdebd67dcdbb85df7f0104f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:28:49 +00:00
TreeHugger Robot
061b39a53c [automerger skipped] Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into sc-v2-dev am: 59e3358add -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21674619

Change-Id: If4093815e9b5a1969656fde41249e9e7e7e89b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 17:53:42 +00:00
Valentin Iftime
80c5f50d2c [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: 733089e71c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609150

Change-Id: I4c4025af1ee90e5161e4b544d8ab5087e8783339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 17:52:40 +00:00
Valentin Iftime
c96b840ebf [automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: e0d45afddf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21674619

Change-Id: Id7c155dfbd2edb9eb5f123a473d4d3328c591dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 17:52:24 +00:00
TreeHugger Robot
59e3358add Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into sc-v2-dev 2023-03-13 17:17:11 +00:00
Azhara Assanova
33f83bf7a5 Add Toast#show() specific javadoc 
The added javadoc comment already exists in Toast's class level javadoc on line 75.

Bug: 265306493
Test: None
Change-Id: I5692db36461dae1f79a72eb2bb15d8379bd24a84
 2023-03-10 14:02:06 +00:00
Valentin Iftime
733089e71c [DO NOT MERGE] Wait for preloading images to complete before inflating notifications 
NotificationContentInflater waits on SysUiBg thread for images to load, with a timeout
 of 1000ms.

Test: 1. Build a test app that posts MessagingStyle notifications with a huge image (8k+) set as data Uri.
 2. SystemUi should not ANR
 3. adb logcat | grep NotificationInlineImageCache  - shows timeout/cancellation logs

Bug: 252766417
Bug: 223859644

Change-Id: I341db60223214cf2282b5c0270e343e1ce95fa01
(cherry picked from commit 195043f40e)
Merged-In: I341db60223214cf2282b5c0270e343e1ce95fa01
 2023-03-10 10:30:49 +01:00
Lucas Lin
2178216b98 Sanitize VPN label to prevent HTML injection 
This commit will try to sanitize the content of VpnDialog. This
commit creates a function which will try to sanitize the VPN
label, if the sanitized VPN label is different from the original
one, which means the VPN label might contain HTML tag or the VPN
label violates the words restriction(may contain some wording
which will mislead the user). For this kind of case, show the
package name instead of the VPN label to prevent misleading the
user.

The malicious VPN app might be able to add a large number of line
breaks with HTML in order to hide the system-displayed text from
the user in the connection request dialog. Thus, sanitizing the
content of the dialog is needed.

Bug: 204554636
Test: N/A
Change-Id: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d
Merged-In: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d
 2023-03-09 21:14:14 +09:00
Diego Vela
bc41a6529c Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev 2023-03-08 00:37:20 +00:00
Diego Vela
5f3a3f2a4b Revert "Fix vulnerability in AttributionSource due to incorrect ..." 
Revert submission 21778925-tm-dev-2-attribution-source

Reason for revert: b/272115855
Reverted changes: /q/submissionid:21778925-tm-dev-2-attribution-source

Bug: 272115855
Change-Id: Ia3d101bab6613da6515acc87af9295da664827cf
 2023-03-07 22:42:00 +00:00
Austin Borger
9967d7c4b2 [automerger skipped] Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into sc-dev am: accb88c894 am: 7ec573b8f8 am: 9bf35389b4 -s ours 
am skip reason: Merged-In Ic985afdb5e4495f2e051e6d0d62d39c6660c585e with SHA-1 7cb165f1c0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21780041

Change-Id: I56438ed63af483ce6fe4dec5cfbf334091c8749c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:15:13 +00:00
Austin Borger
9bf35389b4 Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into sc-dev am: accb88c894 am: 7ec573b8f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21780041

Change-Id: If6ba5fc75a007430c859280bf658d22384f1e5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:44:05 +00:00
Austin Borger
7ec573b8f8 Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into sc-dev am: accb88c894 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21780041

Change-Id: I2cc31e4e246010022738e68ada1aceb175d803a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:06:13 +00:00
Austin Borger
accb88c894 Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into sc-dev 2023-03-06 23:36:01 +00:00
Austin Borger
2fc07deafd Fix vulnerability in AttributionSource due to incorrect Binder call 
AttributionSource uses Binder.getCallingUid to verify the UID of the
caller from another process. However, getCallingUid does not always
behave as expected. If the AttributionSource is unparceled outside a
transaction thread, which is quite possible, getCallingUid will return
the UID of the current process instead. If this is a system process,
the UID check gets bypassed entirely, meaning any uid can be provided.

This patch fixes the vulnerability by emptying out the state of the
AttributionSource, so that the service checking its credentials will
fail to give permission to the app.

Bug: 267231571
Test: v2/android-virtual-infra/test_mapping/presubmit-avd
Merged-In: Ic301a8518b8e57e1c9a2c9f2f845e51dca145257
Change-Id: Ifdc53f87b7ef53b69cc01ec1955b4cb1dfd3345b
Merged-In: Ic985afdb5e4495f2e051e6d0d62d39c6660c585e
 2023-03-06 22:20:43 +00:00
Austin Borger
1e6fb47016 Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into tm-dev 2023-03-06 22:19:44 +00:00
Austin Borger
7cb165f1c0 Fix vulnerability in AttributionSource due to incorrect Binder call 
AttributionSource uses Binder.getCallingUid to verify the UID of the
caller from another process. However, getCallingUid does not always
behave as expected. If the AttributionSource is unparceled outside a
transaction thread, which is quite possible, getCallingUid will return
the UID of the current process instead. If this is a system process,
the UID check gets bypassed entirely, meaning any uid can be provided.

This patch fixes the vulnerability by emptying out the state of the
AttributionSource, so that the service checking its credentials will
fail to give permission to the app.

Bug: 267231571
Test: v2/android-virtual-infra/test_mapping/presubmit-avd
Merged-In: Ic301a8518b8e57e1c9a2c9f2f845e51dca145257
Change-Id: Ic985afdb5e4495f2e051e6d0d62d39c6660c585e
 2023-03-06 20:24:12 +00:00
Naomi Musgrave
a8ce54ee33 Merge "Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0bf9" into android12-tests-dev am: dcf85bf11a" into android12L-tests-dev am: 9a4ae94a32" into android13-tests-dev am: 56db2228c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2464453

Change-Id: I55fe08c3ac8a22f083b6198bfdb87b870863fcd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 20:02:05 +00:00
Naomi Musgrave
56db2228c6 Merge "Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0bf9" into android12-tests-dev am: dcf85bf11a" into android12L-tests-dev am: 9a4ae94a32" into android13-tests-dev 2023-03-06 19:18:48 +00:00
Arthur Hung
77dcb62613 [automerger skipped] Merge "Fix WindowInputTests#testOverlapWindow failing (1/2)" into rvc-dev am: 33a2bc8f7a am: 727c672f0f -s ours am: 5e82ca7952 -s ours am: 3e68d6dd8c -s ours am: a3edb5c6a2 -s ours 
am skip reason: Merged-In Idf17fd64c6a1399d04c51e3f0bd600dc4a84239a with SHA-1 c3decccdc6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21781625

Change-Id: I281396050e4e89fc55c547138eb06d0018d76e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:26:15 +00:00
Pinyao Ting
ea6c2789c2 [automerger skipped] Merge "Limit the number of shortcuts per app that can be retained by system" into rvc-dev am: 15ae228ddb am: 1d4b958078 -s ours am: b8f5a215f2 -s ours am: 0ffd1da0c3 -s ours am: b4cb7e1035 -s ours 
am skip reason: Merged-In I001c7a87b62aefa9487bf8efaf3cd02d7cb21521 with SHA-1 94437e989c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21564438

Change-Id: Ibeb4e0bd15ec170f543d5b03c035212b46c95054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:25:07 +00:00
Pinyao Ting
7f18075140 [automerger skipped] Merge "Limit the number of shortcuts per app that can be retained by system" into sc-dev am: d8bf6af4fc am: 2e79de04d1 am: 3f71147ec1 -s ours 
am skip reason: Merged-In I001c7a87b62aefa9487bf8efaf3cd02d7cb21521 with SHA-1 be9d9c04db is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21574889

Change-Id: Ib3e2a10834a470666cb7ca42cd2a1aa8e3da9217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:24:36 +00:00
Mark Renouf
d1780ebee0 [automerger skipped] [conflict] Prevent sharesheet from previewing unowned URIs am: 3062b80fb2 am: b4f4ac8e45 am: f4b4fbea82 am: 1b3b97d91c -s ours am: 648b08d362 -s ours 
am skip reason: Merged-In I582bacca197d814204b48b917a550f72dbde87d6 with SHA-1 e66544a48f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21787171

Change-Id: I2a38dbc5b350909abf3faaf22d9e64084228085b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:23:12 +00:00
Hongwei Wang
b7e5c1617b Merge "Remove Activity if it enters PiP without window" into rvc-dev am: 81224e6f76 am: d6a9b8078a am: 6255caf966 am: d128334160 am: b03c904b97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21564420

Change-Id: Ic78a29ab734647cd3feb4f3b77e40652b155c0c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:22:32 +00:00
Ioana Alexandru
3d4aeb460a [automerger skipped] Trim strings added to persistent snoozed notification storage. am: 931093dfb4 -s ours am: c802fa5c63 -s ours am: 9efe6b8f56 -s ours am: e65fc3aca4 -s ours am: 5a1b96353e -s ours 
am skip reason: Merged-In If7c7db6694330ffbac551d044efadb26219fe17f with SHA-1 6b587717ce is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21740100

Change-Id: I60260f23245ea4792569a9ca1ad8a234570abd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:22:02 +00:00
Ioana Alexandru
3f58018fdd [automerger skipped] Trim strings added to persistent snoozed notification storage. am: 6b587717ce -s ours am: f9c536a35a -s ours am: 710eed864e -s ours am: 5db24d9de3 -s ours 
am skip reason: Merged-In If7c7db6694330ffbac551d044efadb26219fe17f with SHA-1 b8a0787145 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21740259

Change-Id: I89e0fdd2741f30e7dad03e558ff135a6e4d55215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:21:43 +00:00
Ioana Alexandru
0177408b9d Merge "Trim strings added to persistent snoozed notification storage." into sc-dev am: 999e19b80e am: 7e090c87fb am: ff7641804a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21740239

Change-Id: I5bdd6967591bf3e1598e0757e9507048e128d28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:21:18 +00:00
Ioana Alexandru
7b55729249 [automerge] Trim strings added to persistent snoozed notification storage. 2p: b8a0787145 am: 5768ea2278 am: 02a68596d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21740239

Change-Id: I170715c00d27c349c0e6561ea1e1c906fdaddfc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:19:54 +00:00