Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,418 Commits 3 Branches 0 Tags
76c19aed3dbf28dddbe569b8a139cbb988220e70
Commit Graph

761418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
76c19aed3d Merge "Merge "Support exit to full screen to non-split app" into tm-dev am: af014f9eb6 am: aee622bc51" into tm-d1-dev-plus-aosp 2022-04-29 18:31:08 +00:00
Tony Huang
73d57d9f93 Merge "Support exit to full screen to non-split app" into tm-dev am: af014f9eb6 am: aee622bc51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800505

Change-Id: I8d74a3721f749bfd75267de6ecbcc6f726f96ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:31:02 +00:00
Tom Hsu
f9d88cdb2b Merge "Add function of text hyphenate to buttons." into tm-dev am: a2a6d8847f am: cabb09568d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030726

Change-Id: I27f05912e415a7a6a0e107133d43c458ac8ac936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:30:59 +00:00
Super Liu
86214d75b8 Merge "Revert "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: 06f855f07c am: c8ec09a5be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18055312

Change-Id: Ifb10d85fb1a8f672ccca0e3617bb850ba08628e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:30:39 +00:00
Tom Hsu
19d9da754b Merge "Add function of text hyphenate to buttons." into tm-dev am: a2a6d8847f am: abf3e09af4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030726

Change-Id: I7ceb673bedccaeff34da0a250726ff6cdfd2e00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:30:29 +00:00
TreeHugger Robot
b2d7ea2593 Merge "Fix animation target rule due to split screen arch change" into tm-dev am: 992c55b46f am: 86a9a12f92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17821957

Change-Id: I1e37b6c16cb92bf6663c7962c00b784973aed6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:30:18 +00:00
Super Liu
da32883573 Merge "Revert "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: 06f855f07c am: 7c7f975b55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18055312

Change-Id: I4029b057d46f21d4d7aeb1154a7059815dcbd562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:30:10 +00:00
Julia Reynolds
8b6fc0ebe9 Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 9caec02cb7 am: b6ca97cef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872747

Change-Id: I9e093e7779527f216591ac2f76557257a306377a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:29:58 +00:00
TreeHugger Robot
ba31817d2b Merge "Fix animation target rule due to split screen arch change" into tm-dev am: 992c55b46f am: 7fe350ea8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17821957

Change-Id: Ia0ffa5cfd324dbd59206f47b2b9e56e1b07e0652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:29:52 +00:00
Julia Reynolds
15529224e4 Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 9caec02cb7 am: 45d571ef5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872747

Change-Id: I42f1a5ca5bbf1b18103f29b73244cccc3289ae2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:29:28 +00:00
Calvin Pan
a31e2c97c8 Merge "Fix empty resource showing "Und"" into tm-dev am: f71832b46b am: 0b6119192b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983788

Change-Id: Ie404df279308dfed750df36ff2f9b9b6d96e099c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:29:03 +00:00
Betty Chang
d76e5f1342 Merge "[LE] Add intent action for MediaOutputBroadcastDialog" into tm-dev am: 93dce8605b am: 71d340a7eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950725

Change-Id: Ifee9c3c441a859ed437d4f5271fb3767a60bdf2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:28:42 +00:00
Calvin Pan
267b93c79f Merge "Fix empty resource showing "Und"" into tm-dev am: f71832b46b am: b5ba0f40cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983788

Change-Id: I07f4717858d45db368d5e4638495841bd89c7a9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:28:28 +00:00
Betty Chang
23b8342466 Merge "[LE] Add intent action for MediaOutputBroadcastDialog" into tm-dev am: 93dce8605b am: 157987d894 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950725

Change-Id: Iba6ea26eb8ba05b5c7bd3a32fcf9a70694ad68d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:28:05 +00:00
Sam Dubey
3c848c0402 Merge "Revert "Allow activity in ActivityEmbedding split to get Task windowing mode"" into tm-dev am: 4cac1be2ee am: 63a5fc3fd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030738

Change-Id: I930d230f88c68b31664058402ac7e0c009990ead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:27:35 +00:00
Shawn Lin
e36bbb5f7e Merge "Apply display ratio to cutout protection" into tm-dev am: efade0b934 am: ed1c40b44b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951294

Change-Id: I4bdd2f7af80262076bd894f0069d56729c763d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:27:13 +00:00
Sam Dubey
2e546e53d3 Merge "Revert "Allow activity in ActivityEmbedding split to get Task windowing mode"" into tm-dev am: 4cac1be2ee am: aa7fbd2900 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030738

Change-Id: I9a70a65a3d7a777fa93dd782fb37eb15756bfbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:27:05 +00:00
Milton Wu
e42371e468 Merge "Access mCurrentOperation in main handler" into tm-dev am: 7cbaf98546 am: 082b42938d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888683

Change-Id: Ic6b86dcaa92636ad6432272ec29b2f47f2bda78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:26:51 +00:00
Shawn Lin
1fdddd1a1a Merge "Apply display ratio to cutout protection" into tm-dev am: efade0b934 am: 4b7df3fb7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951294

Change-Id: I49f3b0283abf1f9b16c2cacc5a7d94f372ce5fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:26:46 +00:00
Milton Wu
2849e2842e Merge "Access mCurrentOperation in main handler" into tm-dev am: 7cbaf98546 am: aa2c31f611 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888683

Change-Id: Id5db2c58547a3ddcc4aa76a6abceb937942d9cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:26:07 +00:00
Tiger Huang
dc1b6e60f3 Merge "Skip updating DisplayFrames when everything is the same" into tm-dev am: 77305dced2 am: 4d43bf0982 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030582

Change-Id: Ia7b3092821bfe53e53a1cfea9aaf617e223de79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:25:48 +00:00
Tiger Huang
aa3d30e44e Merge "Skip updating DisplayFrames when everything is the same" into tm-dev am: 77305dced2 am: 2f050e447e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030582

Change-Id: I328021606b79da691fa737c0a952e854ff2b9290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:25:44 +00:00
Automerger Merge Worker
9f21d4f1cf Merge "Merge "Avoid alarm lock when calling outside" into tm-dev am: 48d602a8a6 am: 9ce4b25e7d" into tm-d1-dev-plus-aosp 2022-04-29 18:25:35 +00:00
TreeHugger Robot
0ba64955f4 Merge "Avoid alarm lock when calling outside" into tm-dev am: 48d602a8a6 am: 9ce4b25e7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17972621

Change-Id: Iaf030b682e86d74539f6d3393e106809d80aa8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:25:30 +00:00
TreeHugger Robot
8cc959d3e8 Merge "Avoid alarm lock when calling outside" into tm-dev am: 48d602a8a6 am: 007482f6ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17972621

Change-Id: I4fc98dc31a2cc720fab5017f235f270239527471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:25:27 +00:00
Songchun Fan
530365e4c3 Merge "[pm] remove some tests from staged platinum tests" into tm-dev am: a645831a69 am: 1aec428596 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011085

Change-Id: I97bc776e7e0b0643466d44d9b1f965dd5d2bace4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:25:12 +00:00
Songchun Fan
3480ab83bb Merge "[pm] remove some tests from staged platinum tests" into tm-dev am: a645831a69 am: 8f68bc2234 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011085

Change-Id: I5de3c9735ff0ef509457e9f0ed32489792bac47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:24:41 +00:00
TreeHugger Robot
95b31b881b Merge "Fix the issue widget retore doesn't play well with work profile" into tm-dev am: 476efd5f8b am: 53b9da5b1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17992148

Change-Id: I9f9dc9251564b142df29c5696255d3527a53d6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:23:17 +00:00
TreeHugger Robot
756a25cd29 Merge "Fix the issue widget retore doesn't play well with work profile" into tm-dev am: 476efd5f8b am: a4135f64ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17992148

Change-Id: I67a53327520a41b96a89a25dcc9be28a91aeada9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:23:12 +00:00
Sudheer Shanka
13d27a58ea Merge "Remove ConnOnActivityStartTest." into tm-dev am: 9167516120 am: d9535ab36b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18005059

Change-Id: I91cc2709bc757ce7b8249263a92b6012777c6d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:22:59 +00:00
Sudheer Shanka
bf010ca2ea Merge "Fix failure in testUpdateOomAdj_UidIdle_StopService." into tm-dev am: 7f8e1c17d9 am: d29dc865dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17991381

Change-Id: If4bba4d8c7348a2cc7236d59cbf470c5683228a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:22:41 +00:00
Sudheer Shanka
28613fde53 Merge "Remove ConnOnActivityStartTest." into tm-dev am: 9167516120 am: 15f88e9058 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18005059

Change-Id: Ibbec0b3443f2e8e4a7151e573f2cf065df113086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:22:35 +00:00
Bryce Lee
49738df6fc Merge "Unbind from dream overlay in onUnbind." into tm-dev am: 493062c55e am: 68bbe71216 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18054667

Change-Id: Iae39786fc02091df55f82eab2dc7d6058b1940be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:22:24 +00:00
Sudheer Shanka
2b23bc8935 Merge "Fix failure in testUpdateOomAdj_UidIdle_StopService." into tm-dev am: 7f8e1c17d9 am: fb3b0e6239 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17991381

Change-Id: I73a56caa9a0b52311a603d26d65affe17b1b3ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:22:18 +00:00
Nate Myren
06db28b2fa Merge "Show Notification Permission dialog on (some) task trampolines" into tm-dev am: 7585a9580d am: 51499d412a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17776866

Change-Id: I1a047a3512852e30307644e81cb778263e3bb5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:22:10 +00:00
Bryce Lee
630e94c5b1 Merge "Unbind from dream overlay in onUnbind." into tm-dev am: 493062c55e am: 1d306e587b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18054667

Change-Id: I4e623ddee065a93a0d288296c9a82a405b2df320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:21:57 +00:00
Shashwat Razdan
c098b287af Merge "Validating service components after reading them from resources" into tm-dev am: 19a8270160 am: 327b98c770 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17969082

Change-Id: I9a5daa026f67ff43dafaac9ffe29cf1642bc3d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:21:48 +00:00
Nate Myren
db1fe047ab Merge "Show Notification Permission dialog on (some) task trampolines" into tm-dev am: 7585a9580d am: 4e084c4879 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17776866

Change-Id: I9bc8c52556f34449aa58001ce0e90eee3a271dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:21:36 +00:00
Shashwat Razdan
33ff8ebe30 Merge "Validating service components after reading them from resources" into tm-dev am: 19a8270160 am: b7be81055a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17969082

Change-Id: I036be457518034bf60e23df75e9b6defd1046b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:21:16 +00:00
Rachel Lee
89155f8a6b Merge "Remove getLatestVsyncEventData in Choreographer." into tm-dev am: fa426b9d49 am: aae585f09a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17969373

Change-Id: I431499885792206b92b0ccaa074958496bd982b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:21:01 +00:00
TreeHugger Robot
f61513913c Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2e6 am: b966219132 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416120

Change-Id: I2efb76ba7a39b133a68dcf01ca62e849137b4cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:20:42 +00:00
Rachel Lee
6789acb7dd Merge "Remove getLatestVsyncEventData in Choreographer." into tm-dev am: fa426b9d49 am: 1b3b5cb738 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17969373

Change-Id: If0ddeae6ffc89892bdd68442f6615af58c405985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:20:31 +00:00
Automerger Merge Worker
21adae3c77 Merge "Merge "Dismiss dream when activities are started while dreaming." into tm-dev am: 964c0704c5 am: 20f6f656c1" into tm-d1-dev-plus-aosp 2022-04-29 18:20:23 +00:00
Lucas Silva
49716a75b3 Merge "Dismiss dream when activities are started while dreaming." into tm-dev am: 964c0704c5 am: 20f6f656c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988655

Change-Id: I1043e25969423147e6a8c9c8a22ffbf1aa53d09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:20:17 +00:00
TreeHugger Robot
76a30ad67e Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2e6 am: 8aa6d20125 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416120

Change-Id: Icd78fa99d080859bcdfa26dff98649720fcefb5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:20:16 +00:00
Wenhao Wang
ca078a5985 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev am: 06439d0860 -s ours am: 6fb87bd8a5 -s ours am: 4b21d21a5d -s ours am: c4bdfdfad4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If196783584f4a1ca70735e312cf2945f301ae6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:19:08 +00:00
Wenhao Wang
0e31f637e4 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours am: 3506ab2cc7 -s ours am: 05d1dd3df1 -s ours am: 29ed1ef7d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89a34522b5a7c0cea5f6c8ec5725264621174d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:19:05 +00:00
Presubmit Automerger Backend
19ff0e019f [automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours am: ba093891a1 -s ours am: 5c3e5e005b -s ours am: c80b644e21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcd4ad6f6d09850e7668111239bb75b0ddca8f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:18:52 +00:00
Wenhao Wang
c1a15f5060 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev am: 7c4f648b0f -s ours am: e32e565af6 -s ours am: 478bcd4056 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I206f6589a6c1a2442c58c7169a6cb758248afce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:18:11 +00:00
Wenhao Wang
d3f23e3be1 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 62845d9af7 -s ours am: 675f29e0ef -s ours am: c8a6b68c55 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0844b90062e3b3572c8a81de9ea0c045849e57fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:18:08 +00:00