Commit Graph

1224 Commits

Author SHA1 Message Date
Jake Klinker
9871a34cbc Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 am: 83d5883687 am: fad62338f9 am: 633996e4bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I62d531ec009270bb3b3eae8f5cd02e5462441e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 03:24:17 +00:00
Jake Klinker
633996e4bb Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 am: 83d5883687 am: fad62338f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: Ib164bfa5daf846fe80e3764ce9f077f75dc076b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 02:34:48 +00:00
Presubmit Automerger Backend
7d9c937d19 [automerge] Fix exposing private messages files through attachments with a content URI. 2p: 0d5452146c 2p: 471c3e9320 am: 749732f47b am: 78c26722e2 am: 7bf7a451f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: Ic13449a3884c39331cd66ab3733d0f97d8ae9de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:53:13 +00:00
Jake Klinker
fad62338f9 Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 am: 83d5883687
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I7a6fa5befbf67d50fac2225ce835a5c519e8c46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:51:29 +00:00
Jake Klinker
6daf7c7dab Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 am: 6542270a1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I07b12cba891563e7bb935980afe3352cda7104af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:50:09 +00:00
Jake Klinker
6542270a1f Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: Ida74ec2de652b8e4fcb874a111852f655ba64cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:14:07 +00:00
Jake Klinker
83d5883687 Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: Iecdb3fbc6a6ada726fcb24b55835071db984e2d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:12:06 +00:00
Presubmit Automerger Backend
7bf7a451f7 [automerge] Fix exposing private messages files through attachments with a content URI. 2p: 0d5452146c 2p: 471c3e9320 am: 749732f47b am: 78c26722e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I1c37352d2c828b7c5da07e146417bd59e4dfdd16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:07:51 +00:00
Presubmit Automerger Backend
78c26722e2 [automerge] Fix exposing private messages files through attachments with a content URI. 2p: 0d5452146c 2p: 471c3e9320 am: 749732f47b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: Ied33ba04c0254c30e99d89bdcbcbc73696a1b35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:28:12 +00:00
Jake Klinker
f5c73b1923 Fix exposing private messages files through attachments with a content URI. am: 0d5452146c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I56f3015298ed0b2acde72442b458e0b354f0e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:27:51 +00:00
Presubmit Automerger Backend
749732f47b [automerge] Fix exposing private messages files through attachments with a content URI. 2p: 0d5452146c 2p: 471c3e9320
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Bug: 275552292
Change-Id: I48af374ac45d21758789153013278d68290ee701
2023-05-09 14:00:58 +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
f1b8f9a226 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:51 +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
TreeHugger Robot
6ac4faba39 Merge "Add unaudited exported flag to exposed runtime receivers" 2022-11-04 13:03:45 +00:00
Cole Faust
ab7151ec62 Fix errorprone warnings that should be errors am: 50b73ca58a am: f812cb353b am: 9000f7ab0b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2255931

Change-Id: I824fc3032b18d2dd5484ef1c1ffce877f274f7e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 03:21:20 +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
Michael Groover
4b17ed7f80 Add unaudited exported flag to exposed runtime receivers
Android T allows apps to declare a runtime receiver as not exported
by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag;
receivers registered with this flag will only receive broadcasts from
the platform and the app itself. However to ensure developers can
properly protect their receivers, all apps targeting U or later
registering a receiver for non-system broadcasts must specify either
the exported or not exported flag when invoking #registerReceiver;
if one of these flags is not provided, the platform will throw a
SecurityException. This commit updates all the exposed receivers
with a new RECEIVER_EXPORTED_UNAUDITED flag to maintain the existing
behavior of exporting the receiver while also flagging the receiver
for audit before the U release.

Bug: 234659204
Test: Build
Change-Id: I15aba10fe12dfcd2e67330ca844491341ef6d920
2022-10-04 17:18:17 -05:00
Chaohui Wang
077852abdd Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f am: 9cd6eea905 am: 164064c1c4 am: 8817e83c92 am: 1b37d166b3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: Id0e8d9b98533b82298bb6292d5cce20fca0f57cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 22:11:01 +00: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
bfb5bb2071 Update DrawableWrapper to DrawableWrapperCompat am: f648675fab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/19946229

Change-Id: Ibdb65ea61d3d4c58143d6fef8441189dbad58ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:40:29 +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
Chaohui Wang
79481ab146 Update DrawableWrapper to DrawableWrapperCompat
Api changed in aosp/2120177

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

Change-Id: I5b9d248cdfbed8a0a683384d2081e6736dedbafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 20:11:25 +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
68b504898a [automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours am: 0e6cdf2eb7 -s ours am: ad83b97fc2 -s ours am: ecdfb3e761 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9b01e428c22d660ee142dbcd03fcef3a2b02057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 06:50:34 +00: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
3af6742c9e Remove uses of Time. am: 909a0763c6 am: 8edea90f7f am: e565640312 am: 7a0e0b8598 am: 802daa4de5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: I32cffdcdede552710a7b8df4e82c5961ed8f841c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 10:19:39 +00: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
350a8b2268 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours am: 43050c5ad2 -s ours am: 96b21cc97f -s ours am: 8770af9794 -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: Ie1fce3e57167bbae65efe3ba0739106f66d8e68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 01:04:36 +00: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