summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-23Add MODIFY_PHONE_STATE when registering receiverandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseJongduck You
ACTION_TTY_PREFERRED_MODE_CHANGE cannot be converted to a protected-broadcast Prevent RcsService from receving the intent that sent from unpriviledged apps Bug: 235100180 Tests: Check Permission Denial of broadcasted intent Change-Id: I70727da0e2461512100ab9e35e382aff2f7f2de4
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I42fbed575d4df1153dfb757b0a023deaceefb83e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I67b07c5fb2d8dfc18d9c54c3cfd573ed262c3fc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devjoonhunshin
the EAB provisioned. Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if the EAB provisioned. Bug: 229793066 Test: atest ImsService Change-Id: I646675a4b0454c6c3038f4cc70b380072e063e7c
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵Xin Li
-s ours am: f3167a3421 -s ours am: 670521dcdb -s ours am: 5b37f3e3c0 -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I999b9c2caa0556eb2ab0703a8376d147d3af33b7
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵Xin Li
-s ours am: f3167a3421 -s ours am: 670521dcdb -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I1fda8534696dc860031d4fd9a19367c51cfc84d3
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
-s ours am: f3167a3421 -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I0ab17e95ee081fd19ad768637fcfcef74dab88c3
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵Xin Li
-s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I68e2f069aa8794e421f2b7ed66370109132e5b45
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s oursXin Li
am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: Iad2a226a1ad84334a11815a171e369d6851cb795
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I623d78b62308dec895c0fa15f38fedfc47d7013a Change-Id: Iff32646cedebed894b886dc486b27b5df8e0a3ee
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7d30431d06 -s ours am: c99ffa3510 -s ours am: c0f0a4266b -s ours am: cdcae2de6d -s ours am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/15571843 Change-Id: Ifa6ae13051107ac22ef7a01a6a7ba016d7403edd
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7d30431d06 -s ours am: c99ffa3510 -s ours am: c0f0a4266b -s ours am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/15571843 Change-Id: Ie81a4fcb634a9b2f7696c6bcaa782f156414147e
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7d30431d06 -s ours am: c99ffa3510 -s ours am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/15571843 Change-Id: Iaa13809a620ca349b77540a6075cdd66beb4279d
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7d30431d06 -s ours am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/15571843 Change-Id: Ia21f3bae731f260b4a98c27d15c400fe94a41bbf
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 Change-Id: I623d78b62308dec895c0fa15f38fedfc47d7013a
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 221e35e17a am: ↵Xin Li
1a27e801ad am: 39584c847c -s ours am: 22e4071177 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797 Change-Id: I5c6ef359b451dac5e79082f69a9e130fa68adf79
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 221e35e17a am: ↵Xin Li
1a27e801ad am: 39584c847c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797 Change-Id: I3a21dc7bbc7b3e8ce2ee87c711d08f75912e3a1f
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 221e35e17a am: 1a27e801adXin Li
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797 Change-Id: Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 221e35e17aandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797 Change-Id: I42e700d337869c55e5bd79f0b7e00b6641f0f302
2021-06-11DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Change-Id: Id5c8ec8946d7bcb311a9acd94eebf1a08b993fd4
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I1b38292186ea97f53f316f2bd0b6b590b4985d5c
2021-05-30[RCS]Add protected broadcast, DEVICE_STORAGE_FULLallenwtsu
Bug: 156113993 Test: by manual Change-Id: I47b71d35a2247dc7c75cecaf2669255875892753
2021-05-19[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵Treehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am: 65b06c255a -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: I04f52d62fc802112d09ec9cb162d0a6bd0969a42
2021-05-18[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵Treehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am: cf57f5df73 -s ours am: 4ed44fc701 -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: I9fdd28cafb22e104c197039999993c7ae1f57131
2021-05-11[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵Treehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am: cf57f5df73 -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: I397a9dfa39335f75fb4958fc28415dc8b8099cec
2021-05-11[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseTreehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: Id105a0ac7ea9ddce06243393e5e53813be06125c
2021-05-11[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵Treehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: I3e6a3bee31d3b81afe28a70a079296d131fbbc82
2021-05-11[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: Icb06f332cebcf4a85dd5c14db9ea8c003407ea7f
2021-05-11[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵Treehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: Iea26810bee13c1b1724685569ca01d4e3c2f3b82
2021-05-11[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devTreehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: I2d74562804fb38db1cb6caf87a486f9547b7ab9a
2021-05-11Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead"" am: ↵Treehugger Robot
a281046577 am: d2eb366490 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: I02353f7c812029f18bc8e0a4ae630d028904413e
2021-05-11Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead"" am: a281046577Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: Ibb3c11c7bef069dcde89920259e14bac75b70bca
2021-05-11Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead""android-s-beta-2android-s-beta-1Treehugger Robot
2021-05-11Revert "Use TelephonyManager#isEmergencyNumber() instead"Shuo Qian
Revert submission 1453740-replace_with_isEmergencyNumber Reason for revert: <Telephony service may not up while calling this, causing failures.> Change-Id: I879edfacddf86b252ee60b7833369b30cb1df9f1 Bug: 132703886
2021-03-19Fix CS external dependencies on RcsService am: 728638dc60 am: 3a184aa4f9 am: ↵paulhu
fd5cecf7da am: b4379a76f1 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1644426 Change-Id: Iadca705202306d95dc588806eb4d1db646835220
2021-03-19Fix CS external dependencies on RcsService am: 728638dc60 am: 3a184aa4f9 am: ↵paulhu
fd5cecf7da am: b4379a76f1 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1644426 Change-Id: I46beea9c302ffc84b2b876714b7519a07f036406
2021-03-19Fix CS external dependencies on RcsService am: 728638dc60 am: 3a184aa4f9 am: ↵paulhu
fd5cecf7da Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1644426 Change-Id: I0a6b153a34a585ba01f20bdcac735f28989b31e5
2021-03-19Fix CS external dependencies on RcsService am: 728638dc60 am: 3a184aa4f9temp_ab_7272582paulhu
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1644426 Change-Id: If7651c5a77f2f4c518956baabbfb5fe15f697687
2021-03-19Fix CS external dependencies on RcsService am: 728638dc60paulhu
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1644426 Change-Id: I0db094baf2cf9b801cdfff8d268b44d7903e31f0
2021-03-18Fix CS external dependencies on RcsServicepaulhu
Bug: 183068713 Test: make Change-Id: Ic8776c669963d77e52e4bd6b971d73b3311d758a
2021-03-04[automerger skipped] Move RCS apps to system-ext am: fb09d4553f am: ↵Brad Ebinger
cf32fb1e94 am: 513c98ef17 -s ours am: 54a119f553 -s ours am skip reason: Change-Id I3985002417d578060aca36022dbd507d8f7ad5b9 with SHA-1 d7f8179a86 is in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1613879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieff2e2b1ab20c9b104ac13b0c4f27821b7dba60b
2021-03-04[automerger skipped] Move RCS apps to system-ext am: fb09d4553f am: ↵Brad Ebinger
cf32fb1e94 am: 513c98ef17 -s ours am: 54a119f553 -s ours am skip reason: Change-Id I3985002417d578060aca36022dbd507d8f7ad5b9 with SHA-1 d7f8179a86 is in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1613879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifb8e0f17ec6f829ff10c229cd57b30a567cec7a4
2021-03-04[automerger skipped] Move RCS apps to system-ext am: fb09d4553f am: ↵Brad Ebinger
cf32fb1e94 am: 513c98ef17 -s ours am skip reason: Change-Id I3985002417d578060aca36022dbd507d8f7ad5b9 with SHA-1 d7f8179a86 is in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1613879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia0dc4f7690e1b653e529f92e94135df4e7a4c3ec
2021-03-04Move RCS apps to system-ext am: fb09d4553f am: cf32fb1e94Brad Ebinger
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1613879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11432fa6fd76f440025639f8fe014b7d2a6ad8ad
2021-03-03Move RCS apps to system-ext am: fb09d4553fBrad Ebinger
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1613879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2a63af8dce72980f1aa1dba1a4fcac788311e3e5
2021-03-03Move RCS apps to system-extBrad Ebinger
Moving RCS apps to system-ext to allow vendors to include RCS apps in makefiles if they still use them. Bug: 178489990 Test: make targets Merged-In: I3985002417d578060aca36022dbd507d8f7ad5b9 Change-Id: I3985002417d578060aca36022dbd507d8f7ad5b9
2021-03-02Tag appropriate AlarmManager intents with FLAG_IMMUTABLE am: 250828c0f4 am: ↵Brad Ebinger
8b7fdda762 am: 45ab3179de am: a2f4fdb0e3 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1612237 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic09f7af0323526265549cd19b00840a02fe584c7
2021-03-02Tag appropriate AlarmManager intents with FLAG_IMMUTABLE am: 250828c0f4 am: ↵Brad Ebinger
8b7fdda762 am: 45ab3179de am: a2f4fdb0e3 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1612237 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1b09fb246f62510d0e036a708bfd3979df482667
2021-03-02Tag appropriate AlarmManager intents with FLAG_IMMUTABLE am: 250828c0f4 am: ↵Brad Ebinger
8b7fdda762 am: 45ab3179de Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1612237 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I683cda1d0dae42fd9056cb53456670f07fcec4b3
2021-03-02Tag appropriate AlarmManager intents with FLAG_IMMUTABLE am: 250828c0f4 am: ↵Brad Ebinger
8b7fdda762 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1612237 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e30643a9ef1366af47910db64621de0595eca8f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 15:15:34 +0000