filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,182 Commits 1 Branch 0 Tags
f9cd093ca04709df9d2325b35f233083bda9c6eb
Commit Graph
1182 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Dsouza f9cd093ca0 Add README am: 3aeba4cab6 am: 591bf2432c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2614297

Change-Id: I6fa9f9f108e9af79cadd6679b1e2c12d0cb6df19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 17:52:43 +00:00
Amith Dsouza 591bf2432c Add README am: 3aeba4cab6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2614297

Change-Id: Ic8def036efb311ef3cc7f1e25a68c4b3ce211efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 16:46:36 +00:00
Amith Dsouza 3aeba4cab6 Add README 
With details about the status of support for this app

Bug: 280583057
Change-Id: Ib6aea146a33329d3f6c1e375e99f600699318ce4
 2023-06-05 04:56:02 +00:00
Presubmit Automerger Backend 22ba5f1d3d [automerge] Trim recipient addresses that are unreasonably long. 2p: e37bb58fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23181897

Bug: 278556945
Change-Id: Iea18a6475bc3157bcfe8a0cae05f7357e5003acd
 2023-05-11 21:59:33 +00:00
Jake Klinker e37bb58fbb Trim recipient addresses that are unreasonably long. 
This ensures that bad input does not affect the db - the fallback is a reasonable one where we just launch the new conversation screen and have the user select the recipient.

TESTED=manually confirmed that I could no longer repro b/278556945 after this change.
BUG=278556945

Change-Id: I705a304a92cb46b20d916c6f5c2db81e6fa84f06
 2023-05-11 21:59:23 +00:00
Presubmit Automerger Backend 471c3e9320 [automerge] Fix exposing private messages files through attachments with a content URI. 2p: 0d5452146c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Bug: 275552292
Change-Id: I70bfdb81846c81cf0c79d9a1f33140e00734f163
 2023-05-09 14:00:52 +00:00
Jake Klinker 0d5452146c Fix exposing private messages files through attachments with a content URI. 
Change-Id: I30b2a06c67af4a347d03c7504d13b9b9365acafd
Tested: Was no longer able to repro b/275552292.
Bug: 275552292
 2023-05-09 14:00:39 +00:00
Cole Faust 9000f7ab0b Fix errorprone warnings that should be errors am: 50b73ca58a am: f812cb353b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2255931

Change-Id: Id8f5515bcdc63cc1f354d468eb4bcd9ca9fed515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 01:32:48 +00:00
Cole Faust f812cb353b Fix errorprone warnings that should be errors am: 50b73ca58a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2255931

Change-Id: Ic88f3392fb80e1d1377c9442f1da817bc0444192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 01:05:07 +00:00
Cole Faust 50b73ca58a Fix errorprone warnings that should be errors 
This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:

BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower

See https://errorprone.info/bugpatterns for more
information on the checks.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I8b1533cbea835343dcf589cbaa57c63794be58bd
 2022-10-15 21:33:28 -07:00
Chaohui Wang 1b37d166b3 Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f am: 9cd6eea905 am: 164064c1c4 am: 8817e83c92 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: Ibcd5ae8095177b970c6163f25134e3ce2e35ed82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:41:54 +00:00
Chaohui Wang 8817e83c92 Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f am: 9cd6eea905 am: 164064c1c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: I06cf3ed171327507e082b6aebe6ffe31bceccdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:14:25 +00:00
Chaohui Wang 164064c1c4 Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f am: 9cd6eea905 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: I29f2e356092269d6d8fe528be00781e0c0864fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 20:16:29 +00:00
Chaohui Wang 9cd6eea905 Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: I7304dcfeefa72e267029d712fb80abb995f16e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 19:44:43 +00:00
Chaohui Wang f648675fab Update DrawableWrapper to DrawableWrapperCompat 
Api changed in aosp/2120177

Bug: 235727273
Test: TAP
Change-Id: I1645dab6000dc760b4de2bb625e0af8df014c8c8
 2022-09-15 02:21:58 +00:00
Chaohui Wang b1401d612f Update DrawableWrapper to DrawableWrapperCompat 
Api changed in aosp/2120177

Bug: 235727273
Test: TAP
Change-Id: I1645dab6000dc760b4de2bb625e0af8df014c8c8
 2022-08-31 05:05:10 +00:00
Cole Faust af083023d7 Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af am: 5d9a564880 am: 87e54599d3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I31bb5ebc65f6664857fadcaa298963bfc47bd2b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 19:50:28 +00:00
Cole Faust 87e54599d3 Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af am: 5d9a564880 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I712e86ec1b748619457fbabd9edc57518ddf4fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 19:15:13 +00:00
Cole Faust 5d9a564880 Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I3032ac78003108ed396bdfc3e067950b18565bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:41:52 +00:00
Cole Faust c1da51c9af Fix array-related errorprone warnings am: 1aba0b0461 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I27efca401b1b6332cc3fcc037a4bd3f6043158a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:15:08 +00:00
Cole Faust 1aba0b0461 Fix array-related errorprone warnings 
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: I8a507da97e99a7e86577fda91960dd477c0a6af4
 2022-08-23 09:56:15 -07:00
Xin Li ecdfb3e761 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours am: 0e6cdf2eb7 -s ours am: ad83b97fc2 -s ours 
am skip reason: Merged-In Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97 with SHA-1 909a0763c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186587

Change-Id: If55ad601b9c596aa24b61a65a94a2f5a34d54648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:55:30 +00:00
Xin Li ad83b97fc2 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours am: 0e6cdf2eb7 -s ours 
am skip reason: Merged-In Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97 with SHA-1 909a0763c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186587

Change-Id: I1523d98dbb1656e2576661952c89468da72068c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:59:35 +00:00
Xin Li 0e6cdf2eb7 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours 
am skip reason: Merged-In Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97 with SHA-1 909a0763c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186587

Change-Id: I2c6d39abd94c84fc897cf0b69db9ccc543b5c428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:15:15 +00:00
Xin Li aee8039030 DO NOT MERGE - Merge Android 13 
Bug: 242648940
Merged-In: Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97
Change-Id: If921e7f572b3c1a867b20042acc58ae7c9e26821
 2022-08-15 22:04:33 -07:00
Almaz Mingaleev 802daa4de5 Remove uses of Time. am: 909a0763c6 am: 8edea90f7f am: e565640312 am: 7a0e0b8598 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: If43a2c6fda81d6fd07f4fb4d1210a41ced812325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:53:04 +00:00
Almaz Mingaleev 7a0e0b8598 Remove uses of Time. am: 909a0763c6 am: 8edea90f7f am: e565640312 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: Ia4c0e40432cbadc01f791465dd7acbe65bcd0ddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:36:27 +00:00
Almaz Mingaleev e565640312 Remove uses of Time. am: 909a0763c6 am: 8edea90f7f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: I8d49bdabf566dfc1a2a875d68270bc97eed16087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:20:23 +00:00
Almaz Mingaleev 8edea90f7f Remove uses of Time. am: 909a0763c6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: Ifb1497b8c212866284a9c138e58612aa7bde3f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:03:17 +00:00
Almaz Mingaleev 909a0763c6 Remove uses of Time. 
android.text.format.Time is deprecated since 2014 and there are
better alternatives.

Bug: 16550209
Test: presubmit
Change-Id: Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97
 2022-07-11 11:10:18 +01:00
Xin Li 8770af9794 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours am: 43050c5ad2 -s ours am: 96b21cc97f -s ours 
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/19094742

Change-Id: I58954b9d773b4bb974d8b1393eeff2dd45ed31c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 00:02:03 +00:00
Xin Li 96b21cc97f [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours am: 43050c5ad2 -s ours 
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/19094742

Change-Id: I2d2df7ef4ced6973181ee723a6ae4581f1169f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:56:19 +00:00
Xin Li 43050c5ad2 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours 
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/19094742

Change-Id: I1457040a83a4aa8289a66da4d95571bc18195390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:12:49 +00:00
Xin Li a2874315eb Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Change-Id: If491aeefb40d37249174a40dfe1e37a978addf73
 2022-06-27 23:39:10 +00:00
Xin Li e004281f74 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours am: bb06e4f527 -s ours am: ffc5132b01 -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: I509fdb7694320add16e847b03d76d8b5a2491c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:52:45 +00:00
Xin Li ffc5132b01 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours am: bb06e4f527 -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: I0d8771157d0c48a14cd65a13c8089a5da9b1b086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:56:26 +00:00
Xin Li bb06e4f527 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: Ie3737929b03bb869fe74c29bdba5398378f30f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:21 +00:00
Xin Li c91ff4436a [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: Iccb1cc0fb8871540c5cb8ad3f85aa0a207e5691c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:57:15 +00:00
Xin Li 41406c606f Merge Android 12 QPR 3 
Bug: 236045730
Merged-In: I4bdcc5893b6b437afa79f3bc138d1523c1d8431a
Change-Id: If485b9baf115a05eef5942859a54287233b3f171
 2022-06-14 16:48:16 -07:00
Jake Klinker 3153a43657 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: 53ced613ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I449cf1dccdca62bc5451618a66ae43f59c5c7701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:18:08 +00:00
Jake Klinker 65d9cf0f23 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 am: 24594cbf9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I7a16969994fcd4c17ddaf5ccee7c04b1ee8a5817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:17:24 +00:00
Jake Klinker 4d9ed48155 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: c51c783a46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ic94982da7a74f5b756feb2c9169cf5757e4b8bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:16:59 +00:00
Jake Klinker c51c783a46 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I10742143b1c7e1f81a4c8f7a25ca1f949889cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:36:07 +00:00
Jake Klinker 53ced613ab Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I0d6e4bff6d1b3c825a72006768d16697c385271b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:36:03 +00:00
Jake Klinker 24594cbf9d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I4aad45472c767c3e9a9869f76e60009a84431707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:35:55 +00:00
Jake Klinker a707a5cd8d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ic40d53b31defa115d376069d7d873bac70c5d7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:18:26 +00:00
Jake Klinker 6d643719c4 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Iace24a73bdf3f1ece511f4689198b1e28f4026c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:16:54 +00:00
Jake Klinker c8e4ab2b22 Fix url:file:// style URIs from not being detected in UriUtil. 
Change-Id: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Tested: Was no longer able to repro b/222091734.
Bug: 222091734
(cherry picked from commit 2283165c23)
 2022-04-26 16:38:11 +00:00
Xin Li 1049de0c95 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours am: e469e5653c -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17544832

Change-Id: Iefdf5a4be2b176421ef0796445c9e634cb60b795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 09:08:48 +00:00
Xin Li e469e5653c [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17544832

Change-Id: I6dbc9aa6d39a261bf40261781c92d2021b959b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 08:30:54 +00:00