Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
779,451 Commits 3 Branches 0 Tags
a3bb789d280c198d8ca12fc3efa89467790ea807
Commit Graph

779451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a3bb789d28 Merge "Fix unexpected IME visible temporary while dismissing the editor dialog" into tm-qpr-dev am: 45c099a42a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18700126

Change-Id: I7ba6374466d3511603ff4814475afcfde7c09c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 05:50:47 +00:00
TreeHugger Robot
45c099a42a Merge "Fix unexpected IME visible temporary while dismissing the editor dialog" into tm-qpr-dev 2022-06-06 05:37:01 +00:00
Ming-Shin Lu
216740142f Fix unexpected IME visible temporary while dismissing the editor dialog 
In DC#computeImeParent we defer reparenting IME surface to the target
until the target has started the input to be the input target since the
IME requested visibility will updated after then.

However the logic didn't aware of the IME input target may null when it
be removed, so IME surface will be appear on the display area if the
next layering target has not yet to start the input.

The lucky thing is CloseImeEditorPopupDialogTest caught this errorprone
when verifying IME layer will expected gone after IME-snapshot/dialog
dismissed, but actually may failed by IME layer may still visible
after dismissed the dialog.

Fix this defer IME reparent logic and also consolidate
CloseImeEditorPopupDialogTest in FlickerTest to verify IME snpshot and
IME visiblity until IME window has gone to ensure the layer tracing
could record the full animation frames to verify the IME-snapshot /
IME layer visiblity correctly during the animation.

Fix: 231108751
Test: atest FlickerTests:CloseImeEditorPopupDialogTest
        --rerun-until-failure 20
Change-Id: I863231507c210739fd363746ccbc8ac9072e8094
 2022-06-06 01:47:49 +00:00
Mark Renouf
b5bbfa1fa2 Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: 6c61b6a9e3 am: 2c108ffdf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: Ied3416e4e2acc3a1b3f0b66272bfca583fe90ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 13:30:46 +00:00
Mark Renouf
f04a1893ac Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: 6c61b6a9e3 am: d7b1c860b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: I7dacc1ee20f785878e099f2de2abb15f999d79c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 13:10:11 +00:00
Mark Renouf
5ae61e909c Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: f89b28c4c6 am: e5990a182e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: I351ca879cb1c53a1b357b667e5f554d3eb646b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 13:09:58 +00:00
Mark Renouf
d7b1c860b1 Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: 6c61b6a9e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: I54eacc6e840ba3f533a13d21a0d59a74c5b9c16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 13:02:42 +00:00
Mark Renouf
2c108ffdf4 Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: 6c61b6a9e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: I3add4d0f4a3fd65b4100f4eb1a197ea5358d3f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 13:02:40 +00:00
Mark Renouf
e5990a182e Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: f89b28c4c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: I7d043586f2187d4b6cf9cb148b06b5b87cb794bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 12:54:36 +00:00
Mark Renouf
6c61b6a9e3 Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: I465464c13e6863ce25f1d5dc64e9ffe271ec68b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 12:39:46 +00:00
Mark Renouf
f89b28c4c6 Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: I62b7d51c4186e9e17da9539fadc6eeabc22a31e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 12:38:25 +00:00
Mark Renouf
08a70e40fb Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev 2022-06-04 12:13:21 +00:00
Automerger Merge Worker
a079439f68 Merge "Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 am: 5441f2c9fc" into tm-d1-dev-plus-aosp am: 753b23611f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557780

Change-Id: I19ef5760d52db57db7a7e13784a182aef2256c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 08:19:49 +00:00
Jon Eckenrode
a97afbb0f2 Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 am: 6174850f23 am: be066e8b82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557780

Change-Id: Icd7c8c873caedd7d085216df72a62b1601a7a0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 08:19:23 +00:00
Jon Eckenrode
8f0345f5b6 Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 am: 6174850f23 am: 45ad92756e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557780

Change-Id: I43b98d599a28e0a55da4a5e6bc25153f4331091f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 08:19:05 +00:00
Automerger Merge Worker
753b23611f Merge "Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 am: 5441f2c9fc" into tm-d1-dev-plus-aosp 2022-06-04 08:01:54 +00:00
Jon Eckenrode
2426dc0ba1 Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 am: 5441f2c9fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557780

Change-Id: Id600253d07c140b4ae20107eb23790cf46320835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 08:01:46 +00:00
Jon Eckenrode
be066e8b82 Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 am: 6174850f23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557780

Change-Id: Iab31cdb5792b6b7f04531404a1834b7fc5d641ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 08:01:45 +00:00
Jon Eckenrode
45ad92756e Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 am: 6174850f23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557780

Change-Id: I4874fbe2e7abe3be55db85140bf49d56dd30a87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 08:01:44 +00:00
Jon Eckenrode
6174850f23 Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557780

Change-Id: I47dc6c0e7190b2ef422c546cb62214b7ee400e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 07:42:56 +00:00
Jon Eckenrode
5441f2c9fc Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev am: f7ed36ba88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557780

Change-Id: I29be83a60054b1fbe04dc5c62f262714a4b0bef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 07:41:27 +00:00
Jon Eckenrode
f7ed36ba88 Merge "Revised the API documentation for screenWidthDp and screenHeightDp to include information about window insets and embedded activities." into tm-dev 2022-06-04 07:23:40 +00:00
Automerger Merge Worker
8752d6cbb2 Merge "Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 am: a455311d89" into tm-d1-dev-plus-aosp am: 3bf1904549 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713012

Change-Id: If1de41e9b0cda48625ed294ad963b042cf0287f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:58:07 +00:00
Matt Casey
6004964a37 Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 am: 739183a24e am: 6f0b838b7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713012

Change-Id: I0b3906d08735381cabb794d3f847b7fc11634d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:57:37 +00:00
Matt Casey
180db942dc Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 am: a455311d89 am: 855eb9651c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713012

Change-Id: I6308c820ac688bdbe0e68f180a46a9bbaea193eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:57:19 +00:00
Automerger Merge Worker
3bf1904549 Merge "Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 am: a455311d89" into tm-d1-dev-plus-aosp 2022-06-04 02:35:28 +00:00
Matt Casey
6f0b838b7e Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 am: 739183a24e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713012

Change-Id: I675feb1480339b1f5498185421514e6a2ebdaa20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:35:07 +00:00
Matt Casey
32fc0a02bd Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 am: a455311d89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713012

Change-Id: I777757baf2544c29affe584326fab78db6cc2352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:35:07 +00:00
Matt Casey
855eb9651c Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 am: a455311d89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713012

Change-Id: I5067829f1583923717d3581a5250f977a57163f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:35:06 +00:00
Matt Casey
a455311d89 Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713012

Change-Id: Id9a6e80bbfb31aaaf66f4d34cfcc3516beee1ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:11:20 +00:00
Matt Casey
739183a24e Merge "Accessibility fixes for clipboard overlay" into tm-dev am: 6e3282ca56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713012

Change-Id: I484539d31bceb7f59fa2fd21b4dc2554a22d6bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:09:39 +00:00
Matt Casey
6e3282ca56 Merge "Accessibility fixes for clipboard overlay" into tm-dev 2022-06-04 01:48:10 +00:00
Automerger Merge Worker
56f4b546e2 Merge "[automerger skipped] Merge "HealthServiceWrapperAidl fix NPE" am: aa3c079d2a am: 56602664f2 -s ours" into tm-dev-plus-aosp am: 82d1e32454 -s ours am: 375e2a0e1d -s ours 
am skip reason: Merged-In I45c4ebca8c5612fdfbab8ffd28b9c2799d74869a with SHA-1 30f2c7820c is already in history

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

Change-Id: I7aac5a8afebcdc6256414da29358f9e6a66d3c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:43:10 +00:00
Treehugger Robot
3089cfb241 [automerger skipped] Merge "HealthServiceWrapperAidl fix NPE" am: aa3c079d2a am: 56602664f2 -s ours am: 5fb375848c -s ours am: 81196b189f -s ours 
am skip reason: Merged-In I45c4ebca8c5612fdfbab8ffd28b9c2799d74869a with SHA-1 30f2c7820c is already in history

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

Change-Id: I12a944b60e84608c21c361a6407436eb6686fff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:42:49 +00:00
Evan Severson
f4280dcfa4 [automerger skipped] Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71c0 am: 500d27a12c am: 0d49574c94 -s ours am: 16f54919d5 -s ours am: 239ab7b4ff -s ours am: 294087eb47 -s ours 
am skip reason: Merged-In Idcf5ac9a5401ad8089f5873da1f978fdf9258b5a with SHA-1 61c2d0291b is already in history

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

Change-Id: I99eff6d898047449b11d49e10e77928d75c95f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:42:31 +00:00
Evan Severson
dfc4638e48 [automerger skipped] Allow system server uid to bypass location restriction am: 1dddfe1f70 am: 6df07033f9 am: 98862939f6 -s ours am: 044f0a605f -s ours am: 4fe8c9ff41 -s ours am: aa4a7476c5 -s ours 
am skip reason: Merged-In Ic869da4847e4f39896861f3bf6e83f6f6c76ea62 with SHA-1 cad40dc9b1 is already in history

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

Change-Id: I17bf005580809d9c169918a252642701829d82c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:42:09 +00:00
Evan Severson
87feee9f4d [automerger skipped] Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev am: 96a5a3b953 am: 628a553661 -s ours am: 73e2c9a411 -s ours am: 4dd193c922 -s ours am: fdfd28462e -s ours 
am skip reason: Merged-In Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d with SHA-1 530407c903 is already in history

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

Change-Id: I3bc5cf162ba1d97b070cc0c81bc8d5f7807a20a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:41:31 +00:00
Evan Severson
fc22324c43 [automerger skipped] Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71c0 am: 500d27a12c am: 0d49574c94 -s ours am: 16f54919d5 -s ours am: aae29959cc -s ours am: 21950e3109 -s ours 
am skip reason: Merged-In Idcf5ac9a5401ad8089f5873da1f978fdf9258b5a with SHA-1 61c2d0291b is already in history

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

Change-Id: Ib99e3d1be1afe03e7a72f5674420829a1ad068f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:41:00 +00:00
Evan Severson
b3094f1ac0 [automerger skipped] Allow system server uid to bypass location restriction am: 1dddfe1f70 am: 6df07033f9 am: 98862939f6 -s ours am: 044f0a605f -s ours am: f70bd05824 -s ours am: 11157d8375 -s ours 
am skip reason: Merged-In Ic869da4847e4f39896861f3bf6e83f6f6c76ea62 with SHA-1 cad40dc9b1 is already in history

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

Change-Id: Id57cc98b13b52caedc3fbc49a992d3e12042350b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:40:39 +00:00
Evan Severson
e341a98993 [automerger skipped] Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev am: 96a5a3b953 am: 628a553661 -s ours am: 73e2c9a411 -s ours am: d900c5fddb -s ours am: f04f9a807f -s ours 
am skip reason: Merged-In Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d with SHA-1 530407c903 is already in history

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

Change-Id: Id22ec563b2293fb28275099f6328b7c8eb74d2cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:40:24 +00:00
TreeHugger Robot
17ac1a7845 Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc701 am: 37700810b6 am: 92151ffa52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659181

Change-Id: I32cf0afa82be13ee5aba3569846269ba4805a707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:39:37 +00:00
TreeHugger Robot
6abb4755b3 Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc701 am: 0e2943e397 am: 06df86c7f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659181

Change-Id: I8592d3f2850203b3cec861f3a7fee62c5ceb0567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:37:39 +00:00
Evan Severson
2b1c5d9ed4 [automerger skipped] Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71c0 am: 500d27a12c am: 0d49574c94 -s ours am: 16f54919d5 -s ours am: aae29959cc -s ours am: b1410455ef -s ours 
am skip reason: Merged-In Idcf5ac9a5401ad8089f5873da1f978fdf9258b5a with SHA-1 61c2d0291b is already in history

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

Change-Id: Ie3525d38d133f713ca5ce164cfd7d1d51dd25685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:37:17 +00:00
Evan Severson
de8309c121 [automerger skipped] Allow system server uid to bypass location restriction am: 1dddfe1f70 am: 6df07033f9 am: 98862939f6 -s ours am: 044f0a605f -s ours am: f70bd05824 -s ours am: 985cb58fef -s ours 
am skip reason: Merged-In Ic869da4847e4f39896861f3bf6e83f6f6c76ea62 with SHA-1 cad40dc9b1 is already in history

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

Change-Id: I4ecb73bdc2e84dce4817e587eaef3eef4db09d0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:37:13 +00:00
Evan Severson
d5fb25bdf4 [automerger skipped] Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev am: 96a5a3b953 am: 628a553661 -s ours am: 73e2c9a411 -s ours am: d900c5fddb -s ours am: a93ec8adef -s ours 
am skip reason: Merged-In Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d with SHA-1 530407c903 is already in history

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

Change-Id: I8e8e14c2f5b8a714bb5dee698ccc29e2df899c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:36:56 +00:00
Automerger Merge Worker
5acde318c4 Merge changes from topic "am-7f7b4a07d2d64926b0d28bce784d30d8" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Remove package title from notification access confirmation intent" into sc-v2-dev am: e87182f963 -s ours am: c616d77ca4 -s ours am: 513a9dcc74 -s ours am: 1bb12a7574 -s ours
  [automerger skipped] Remove package title from notification access confirmation intent am: 51370d2f3f -s ours am: 5db55046f1 -s ours am: 6a086586c8 -s ours am: c7ed8ef38d -s ours
 2022-06-04 01:36:50 +00:00
TreeHugger Robot
046853b9cf Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc701 am: 0e2943e397 am: df154bb733 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659181

Change-Id: I26f0560a9500203e09e24194e904f5b5c87ff43a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:36:42 +00:00
Raphael Kim
5697189498 [automerger skipped] Merge "Remove package title from notification access confirmation intent" into sc-v2-dev am: e87182f963 -s ours am: c616d77ca4 -s ours am: 513a9dcc74 -s ours am: 1bb12a7574 -s ours 
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 735bcf8cf7 is already in history

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

Change-Id: I9d3a444730c050e0f005a7cf1422eec7f1f5f688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:36:38 +00:00
Raphael Kim
4d416e2351 [automerger skipped] Remove package title from notification access confirmation intent am: 51370d2f3f -s ours am: 5db55046f1 -s ours am: 6a086586c8 -s ours am: c7ed8ef38d -s ours 
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 735bcf8cf7 is already in history

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

Change-Id: Ic0074002033684e50c88b3a7ac97285aaa9fb4ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:36:27 +00:00
Raphael Kim
60e42583cb [automerger skipped] Merge "Remove package title from notification access confirmation intent" into sc-v2-dev am: e87182f963 -s ours am: c616d77ca4 -s ours am: 513a9dcc74 -s ours am: d37d1b083f -s ours 
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 735bcf8cf7 is already in history

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

Change-Id: Ib6e97e4b258e4c2847288528f27ed589d01f16a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:36:04 +00:00