TreeHugger Robot
7b372e88df
[automerger skipped] Merge "IMMS: Make IMMS PendingIntents immutable" into qt-dev am: 5ccf55eb8a am: 6c68f5019f am: 02bf64594b -s ours
...
am skip reason: Merged-In I34a95732ef3e7c20d6549b57230c11f0c3db04d6 with SHA-1 6842f03c9d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19119301
Change-Id: Ib774f7657f4cd40d0f402a4ee0b88c90e5040615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 19:01:02 +00:00
TreeHugger Robot
02bf64594b
Merge "IMMS: Make IMMS PendingIntents immutable" into qt-dev am: 5ccf55eb8a am: 6c68f5019f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19119301
Change-Id: I0d1cc16c84d5909e32efacfff3605cafbd9dc990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 18:44:13 +00:00
TreeHugger Robot
6c68f5019f
Merge "IMMS: Make IMMS PendingIntents immutable" into qt-dev am: 5ccf55eb8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19119301
Change-Id: I6489df9d2f15ab52752fd26990d6f1dc24dbc0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 18:28:04 +00:00
Steven Moreland
1bbde50d9a
Parcel: recycle recycles am: b5c79e141a am: 2b5f7f71c3 am: 8b0242a232
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19101007
Change-Id: Ifbc8c734bfb7d200e65c9c6667c0e3b6135d5f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 18:27:52 +00:00
TreeHugger Robot
5ccf55eb8a
Merge "IMMS: Make IMMS PendingIntents immutable" into qt-dev
2022-07-01 18:13:46 +00:00
Steven Moreland
8b0242a232
Parcel: recycle recycles am: b5c79e141a am: 2b5f7f71c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19101007
Change-Id: Iedbf1334020ece5034ec3005f97b79a71a73cb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 18:10:48 +00:00
Steven Moreland
2b5f7f71c3
Parcel: recycle recycles am: b5c79e141a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19101007
Change-Id: Ibd1008515a0d4bc9b919ef13a563de502c332c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 17:54:27 +00:00
Linus Tufvesson
47f5ba9a3f
Merge "Make Activites touch opaque - DO NOT MERGE" into rvc-dev am: 838fc349b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029146
Change-Id: Ic688d0df23417d2faf28129df103005f8fed5230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 09:20:28 +00:00
Linus Tufvesson
61dbe88cf9
Make Activites touch opaque - DO NOT MERGE am: 74ce78dfb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029146
Change-Id: I6731998b36385769ff7322c75d7c931d2221647d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 09:20:15 +00:00
Linus Tufvesson
838fc349b6
Merge "Make Activites touch opaque - DO NOT MERGE" into rvc-dev
2022-07-01 08:53:41 +00:00
Adrian Roos
2b85982616
IMMS: Make IMMS PendingIntents immutable
...
Fixes: 154913391
Test: n/a
Change-Id: I34a95732ef3e7c20d6549b57230c11f0c3db04d6
Merged-In: I34a95732ef3e7c20d6549b57230c11f0c3db04d6
(cherry picked from commit d4b625994f )
(cherry picked from commit 6842f03c9d )
2022-06-29 17:33:52 +00:00
Songchun Fan
cc020a2462
Merge changes from topic "revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO" into qt-dev am: 63257e0e97 am: 78bdbdd22e am: 1cad7c909a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695
Change-Id: I0b960d34be416030eeecb1019de26e0ff2824af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 02:01:46 +00:00
Songchun Fan
3c01c46e0c
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Revert "Revert "[pm] remove old stage dirs on low storage""" am: dde06fe41d -s ours am: 269e4e0e32 -s ours am: 9d8f5dfc20 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695
Change-Id: I5d03af74a3f9ee3afff2eee4a1a479c8195afc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 02:01:43 +00:00
Songchun Fan
145dbe01fe
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 am: 318cccd37d -s ours am: 75365b4139 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213
Change-Id: I1f9c286b3e8769e49fe9ce198d925d771523eded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 02:01:42 +00:00
Songchun Fan
c4ef6c60c0
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 am: 9a00a3d2a8 -s ours am: 332e015554 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213
Change-Id: Ie063698e37504af5390adf41c390ab33a394af5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 02:01:24 +00:00
Songchun Fan
1cad7c909a
Merge changes from topic "revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO" into qt-dev am: 63257e0e97 am: 78bdbdd22e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695
Change-Id: I47264e315e0085cf65b680452e8585651de4de19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:36:42 +00:00
Songchun Fan
9d8f5dfc20
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Revert "Revert "[pm] remove old stage dirs on low storage""" am: dde06fe41d -s ours am: 269e4e0e32 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695
Change-Id: I7a5eeaced6e9c71553fa370dfc83c1ffaa0dafcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:36:28 +00:00
Songchun Fan
75365b4139
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65 am: 318cccd37d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213
Change-Id: I664b4297458f60c98ac5df28307c9bbffc517f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:36:08 +00:00
Songchun Fan
332e015554
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28 am: 9a00a3d2a8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213
Change-Id: I9a8fe839957a612e71545f9c01a6286749b0d889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:35:52 +00:00
Songchun Fan
78bdbdd22e
Merge changes from topic "revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO" into qt-dev am: 63257e0e97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695
Change-Id: I831a7c6e8971d8998bb48326ef890c23dd8a97ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:12:56 +00:00
Songchun Fan
269e4e0e32
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Revert "Revert "[pm] remove old stage dirs on low storage""" am: dde06fe41d -s ours
...
am skip reason: skipped by user schfan
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695
Change-Id: I3750cf18bd2049c430dcf292cc19db365f3fc26f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:12:54 +00:00
Songchun Fan
318cccd37d
Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev am: 650eb0cc65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213
Change-Id: I7486e3d5668248c54a0ab6160c8112ef154903f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:12:42 +00:00
Songchun Fan
9a00a3d2a8
[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up" am: 07d74c4c28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213
Change-Id: If22465789761ee4d6077a84b5d570f4392fedbb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 01:12:25 +00:00
Steven Moreland
b5c79e141a
Parcel: recycle recycles
...
Before, it was like getting a used pan with food stuck on it. We run
a clean ship here. You want a Parcel? You get a fresh Parcel. When
we recycle a Parcel, we do a real clean-up job. Air freshener. All
bits brushed over. These Parcel objects are clean as heck now!
(specifically cleans mClassCookies)
Bug: 208279300
Test: build
Merged-In: I250872f5c6796bb64e2dc68008154c0e90feb218
Change-Id: I250872f5c6796bb64e2dc68008154c0e90feb218
(cherry picked from commit 46770fa49c )
2022-06-28 23:11:34 +00:00
Songchun Fan
63257e0e97
Merge changes from topic "revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO" into qt-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "Revert "Revert "[pm] remove old stage dirs on low storage"""
[RESTRICT AUTOMERGE] Revert "Don't abandon child sessions (1/n)"
[RESTRICT AUTOMERGE] Revert "Fix NPE"
2022-06-28 20:37:57 +00:00
Songchun Fan
650eb0cc65
Merge "[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"" into qt-dev
2022-06-28 20:37:57 +00:00
Songchun Fan
dde06fe41d
[RESTRICT AUTOMERGE] Revert "Revert "Revert "[pm] remove old stage dirs on low storage"""
...
This reverts commit 3e28df68fa .
Reason for revert: Reverting CVE-2021-39624 on qt-dev
Change-Id: I26c0abd06e2a49e05f45d153c4247f7c0a269897
2022-06-28 16:42:29 +00:00
Songchun Fan
6b86ed8497
[RESTRICT AUTOMERGE] Revert "Don't abandon child sessions (1/n)"
...
Revert submission 16575908-dont_abandon_child_qt_dev
Reason for revert: Reverting CVE-2021-39624 on qt-dev
Reverted Changes:
I4ede6b7a4:Persist destroyed staged sessions until they are c...
Ib0ba9f378:Don't abandon child sessions (1/n)
Change-Id: I7915e3f0ba6dd8430a9b938a518aeeeb4d6b1805
2022-06-28 16:42:17 +00:00
Songchun Fan
07d74c4c28
[RESTRICT AUTOMERGE] Revert "Persist destroyed staged sessions until they are cleaned up"
...
Revert submission 16575908-dont_abandon_child_qt_dev
Reason for revert: Reverting CVE-2021-39624 on qt-dev
Reverted Changes:
I4ede6b7a4:Persist destroyed staged sessions until they are c...
Ib0ba9f378:Don't abandon child sessions (1/n)
Change-Id: I50ab96061b2e0fa016a0fbdb5773ccc5f2397ac6
2022-06-28 16:37:33 +00:00
Songchun Fan
a4945fcf4b
[RESTRICT AUTOMERGE] Revert "Fix NPE"
...
This reverts commit f562aadd77 .
Reason for revert: Reverting CVE-2021-39624 on qt-dev
Change-Id: Ida84f497eb188b4923acbe8acdbe4d47427aa24e
2022-06-28 16:37:14 +00:00
Kenneth Ford
1554a00af4
Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c am: 3a2171f668 am: e813a20711
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703
Change-Id: I2c4c7f6b37499f78192c138caa830d03a3377d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:04:06 +00:00
Kenneth Ford
e813a20711
Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c am: 3a2171f668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703
Change-Id: I9339317759418659c34ae10dcdb9a98ef7017290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 00:38:39 +00:00
Kenneth Ford
3a2171f668
Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703
Change-Id: Ia735cd97a591faa63c344958b41e7c4feb7f2a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 22:57:41 +00:00
Kenneth Ford
a4924eb85c
Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703
Change-Id: I837accdc0d4f5bada34fe8da18075092dd295801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 22:31:58 +00:00
Linus Tufvesson
74ce78dfb4
Make Activites touch opaque - DO NOT MERGE
...
Block touches from passing through activities by adding a dedicated
surface that consumes all touches that would otherwise pass through the
bounds availble to the Activity.
Bug: 194480991
Test: atest CtsWindowManagerDeviceTestCases:ActivityRecordInputSinkTests
Test: atest CtsWindowManagerDeviceTestCases:CrossAppDragAndDropTests
Test: atest CtsWindowManagerDeviceTestCases:PinnedStackTests
Test: Manually ran through go/wm-smoke (verified pip and splitscreen
still work)
Test: Manually verfied that freeform windows work and don't consume
touches outside their bounds
Change-Id: I01b35e34a63868dead4e728a3d359ae0942302f9
2022-06-13 13:56:34 +02:00
Makoto Onuki
f15b3c2553
Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369
Change-Id: I467f9641cf1376babab8328a06ec173a1c768fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 20:13:20 +00:00
Makoto Onuki
ea69ad5892
Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369
Change-Id: I19750ed605001905eee78852893d1b18e8f274bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 19:55:08 +00:00
Makoto Onuki
822fbf618b
Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369
Change-Id: Ie919bc05747a1009507a29de429c3e8d043fed9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 19:20:45 +00:00
Makoto Onuki
99ccb4e5b0
Merge "Only allow the system server to connect to sync adapters" into qt-dev
2022-06-08 18:56:23 +00:00
Adrian Roos
ba943db1e3
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours
...
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: I4fa5e5be588638b589c8b9c22a3d00513a824fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 08:14:36 +00:00
Adrian Roos
7a57d77f94
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours
...
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: I893c9a98526745498718ea447044a10e4fcf4475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 07:57:05 +00:00
Adrian Roos
c2d5e2cb81
Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: Ia6115784eb97b7759750acca4f271772f8a59ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 07:40:15 +00:00
Adrian Roos
a89cdcefab
Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305
Change-Id: I24bd536937c9794cc17ec42eeeb047940adbb884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 07:39:21 +00:00
Adrian Roos
fa1fc20874
Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev
2022-06-08 07:21:26 +00:00
Adrian Roos
31e8959439
Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev
2022-06-08 07:20:12 +00:00
Chiachang Wang
96f4ca0fbf
Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266
Change-Id: I9910ae29bb623c60b2b8d3794a2f25f673ac4904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:41:55 +00:00
Chiachang Wang
14f1bec4c2
Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266
Change-Id: I24a2ceeab11b6b9b9582bb846524ef46eaf8d6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:15:59 +00:00
Chiachang Wang
dadbab8ae8
Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266
Change-Id: Ia7d1ef07c32c791d71c7bd4561641620aaa66de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 01:58:13 +00:00
Chiachang Wang
3ac8d1dc2f
Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev
2022-06-08 01:30:34 +00:00
TreeHugger Robot
ba83a11456
Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070af0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18629266
Change-Id: I39db46ddace4cc9dd12a0f025b66bb7e1fe0a23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 15:14:44 +00:00