Oliver Woodman
15956dbacd
Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev am: 1574fbe57c am: 52603aed4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918926
Change-Id: Idd74f2c00fb2d30f6456145c11dfe772e498fa8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:07:37 +00:00
TreeHugger Robot
0c9c0b8041
Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev am: 95ac43c8bd am: 1ef250b44c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799650
Change-Id: If4069e15eebc0939c810f0046bd40a5d43e1fa95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:06:58 +00:00
Alex Johnston
f4d5aaf2b9
Merge "Make WorkLockActivity theme translucent" into tm-dev am: 916e42bd21 am: b327cdf79d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18929026
Change-Id: I1d80b35e0b987d274a67b0acb2bf2c302386bdc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:06:09 +00:00
Nate Myren
d4e76c22b3
Merge "Add Ad Services pregrant to DPGP" into tm-dev am: 7f3f9c454c am: c8dd6b11a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18919729
Change-Id: I2e51e894499cc7922ac4dd6ecc23e8cdd450e3f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:04:56 +00:00
Riddle Hsu
2269f3cbe7
Merge "Do not set insets changed for invisible window" into tm-dev am: e79e811a50 am: 8dd5151356
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18912001
Change-Id: I651a946540b7a0882c9d96eef6c726421c21d6c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:03:18 +00:00
Xin Li
8c55039fea
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 195b02b570 -s ours am: ec8f45f692 -s ours am: 21fc567c17 -s ours
...
am skip reason: Merged-In Ia6e09648c74410ce5d14dd6b2032e59466034cb5 with SHA-1 0a3e8a46af is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2126143
Change-Id: I329fa92681bf947929e6c4300a88df2f2d1f6a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:57:39 +00:00
Xin Li
9be836eb60
[automerger skipped] Merge Android 12 QPR 3 am: 6811cf790c -s ours am: c263a56b7b -s ours am: 3ca5df9de3 -s ours
...
am skip reason: Merged-In Ia6e09648c74410ce5d14dd6b2032e59466034cb5 with SHA-1 0a3e8a46af is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2126143
Change-Id: I7d65fa1abaee35891cbd0965e3e023e2041a7651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:56:22 +00:00
T.J. Mercier
ec6428dab8
[automerger skipped] Merge "Revert "Freeze all package processes before killing"" into tm-dev am: 097017f4d7 am: ed7e3fd267 -s ours
...
am skip reason: Merged-In Ib0231eaf4b11b15a3d6bac5dc5486844f0f81d18 with SHA-1 a666f83b82 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18189048
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18961727
Change-Id: Icfca75d10a6347529fe806970d415a2dcff36b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:52:14 +00:00
Oliver Woodman
47ead299b4
Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev am: 1574fbe57c am: fbb13d7bb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918926
Change-Id: I439ab5ad00d922f53a991455a8b4dd4fa256ae28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:51:30 +00:00
TreeHugger Robot
7688c637c4
Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev am: 95ac43c8bd am: 0a6bc03b73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799650
Change-Id: Ia1167ac75ca88c056cf4442da2e667e93fcd4d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:51:04 +00:00
Alex Johnston
dd83779ba5
Merge "Make WorkLockActivity theme translucent" into tm-dev am: 916e42bd21 am: df9326f6d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18929026
Change-Id: I858b92d18d3007f3a09aa9a72f4633bfea88439b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:50:18 +00:00
Nate Myren
ffb3ea90b9
Merge "Add Ad Services pregrant to DPGP" into tm-dev am: 7f3f9c454c am: 058b58df36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18919729
Change-Id: Ifc72d9c66ef8995fbc9f1ffff163c24832e808f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:49:49 +00:00
Riddle Hsu
e9177fae09
Merge "Do not set insets changed for invisible window" into tm-dev am: e79e811a50 am: 40b4671c26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18912001
Change-Id: I8afa7eae641679f5a752bd7ce434b7e46df81729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:49:28 +00:00
Beverly Tai
af73fa1b39
Merge "Add extra logs for skipping hideKeyguardViewAfterRemoteAnimation" into tm-d1-dev am: 532c4fbaf5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18914627
Change-Id: I66536ab520f7988fb2a07cfe74074507bdc6ab5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:48:57 +00:00
Beverly Tai
16c1c7be54
Merge "Update face scanning anim, fix visibility bugs" into tm-d1-dev am: 3dcb829b12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18913060
Change-Id: I0b60c04757c6a299fed00a99a97525bf77b1cced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:47:33 +00:00
TreeHugger Robot
294dad862e
Merge "Require CONFIG_HID_PLAYSTATION for DualSense key layout" into tm-dev-plus-aosp am: 6ea7f6c7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18930751
Change-Id: Ieab879328ec320230c34fccac275f9560e28f40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:39:53 +00:00
T.J. Mercier
ed7e3fd267
Merge "Revert "Freeze all package processes before killing"" into tm-dev am: 097017f4d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18961727
Change-Id: I43078deca3f26ca1f5d73ff8c11c5e12d0c3e471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:30:55 +00:00
Oliver Woodman
52603aed4e
Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev am: 1574fbe57c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918926
Change-Id: Ied35c63444b8096d634097f705dd1635801cc345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:30:35 +00:00
TreeHugger Robot
1ef250b44c
Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev am: 95ac43c8bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799650
Change-Id: I31fe2bdeef6ae9fd7df77a3f5eba7ac390bb44e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:30:17 +00:00
Oliver Woodman
fbb13d7bb9
Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev am: 1574fbe57c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918926
Change-Id: I6dce5d62fd0acbf23176abc13a03ce3d9660a4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:29:56 +00:00
TreeHugger Robot
0a6bc03b73
Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev am: 95ac43c8bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799650
Change-Id: Ia2e250a28117690c24384272a0940def19f8d9a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:29:13 +00:00
Alex Johnston
df9326f6d2
Merge "Make WorkLockActivity theme translucent" into tm-dev am: 916e42bd21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18929026
Change-Id: I3043227d3de3c4fe1bed5eebb33b00cf9d8a6dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:28:18 +00:00
Alex Johnston
b327cdf79d
Merge "Make WorkLockActivity theme translucent" into tm-dev am: 916e42bd21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18929026
Change-Id: Iac91ac8fd04cfec3c78d8481a8f20645f9b3914d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:28:07 +00:00
Nate Myren
c8dd6b11a0
Merge "Add Ad Services pregrant to DPGP" into tm-dev am: 7f3f9c454c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18919729
Change-Id: I761c656ae689749de0e62cd66d08ca85a685efcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:26:26 +00:00
Nate Myren
058b58df36
Merge "Add Ad Services pregrant to DPGP" into tm-dev am: 7f3f9c454c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18919729
Change-Id: Ic88093179538a1c3d8e05ae641ad5900e7cabf2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:24:58 +00:00
Riddle Hsu
40b4671c26
Merge "Do not set insets changed for invisible window" into tm-dev am: e79e811a50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18912001
Change-Id: I581857d6c8e8b93dbc7cc1582ba1acb921f7c3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:23:57 +00:00
Riddle Hsu
8dd5151356
Merge "Do not set insets changed for invisible window" into tm-dev am: e79e811a50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18912001
Change-Id: Iebecdbeb37264ae223fe35775a97ab5b5b6a1df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:20:00 +00:00
T.J. Mercier
097017f4d7
Merge "Revert "Freeze all package processes before killing"" into tm-dev
2022-06-17 16:12:13 +00:00
Beverly Tai
532c4fbaf5
Merge "Add extra logs for skipping hideKeyguardViewAfterRemoteAnimation" into tm-d1-dev
2022-06-17 15:44:55 +00:00
Beverly Tai
3dcb829b12
Merge "Update face scanning anim, fix visibility bugs" into tm-d1-dev
2022-06-17 15:44:20 +00:00
Beverly
8987567ec4
Update face scanning anim, fix visibility bugs
...
- The face scanning view visibility should
always be INVISIBLE if the face scanning anim isn't
running
- The face scanning view height should never
take up the entire screen (there was an issue where the
face sensor location was being requested before the display
resolutiong/scale size was correct, so the face height location
was reporting INFINITY instead of the actual location
of the face camera sensor)
- Face scanning anim needs to handle resolution changes
Test: Settings > Display > Screen resolution
Test: Check hierarchy viewer for size of the view when
the face scanning animation is running, check different
orientations
Test: Check sysui dumpsys when face scanning animation
is NOT showing (view should be visible on reboot)
Test: atest ScreenDecorationsTest
Bug: 185128224
Fixes: 236193243
Change-Id: I35cd1c607f590fd332bfeac37f220eb11aea320e
2022-06-17 15:43:19 +00:00
Oliver Woodman
1574fbe57c
Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev
2022-06-17 11:23:12 +00:00
TreeHugger Robot
95ac43c8bd
Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev
2022-06-17 10:49:38 +00:00
Alex Johnston
916e42bd21
Merge "Make WorkLockActivity theme translucent" into tm-dev
2022-06-17 08:18:09 +00:00
Nate Myren
7f3f9c454c
Merge "Add Ad Services pregrant to DPGP" into tm-dev
2022-06-17 06:14:10 +00:00
Riddle Hsu
e79e811a50
Merge "Do not set insets changed for invisible window" into tm-dev
2022-06-17 05:49:09 +00:00
Xin Li
21fc567c17
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 195b02b570 -s ours am: ec8f45f692 -s ours
...
am skip reason: Merged-In Ia6e09648c74410ce5d14dd6b2032e59466034cb5 with SHA-1 0a3e8a46af is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2126143
Change-Id: Iebf2c50f3fb3ee7fe76718c38b14a3e6234664c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 00:15:49 +00:00
Xin Li
3ca5df9de3
[automerger skipped] Merge Android 12 QPR 3 am: 6811cf790c -s ours am: c263a56b7b -s ours
...
am skip reason: Merged-In Ia6e09648c74410ce5d14dd6b2032e59466034cb5 with SHA-1 0a3e8a46af is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2126143
Change-Id: I67b2a5976f9df8cfed96066447d40139169443ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 00:14:17 +00:00
T.J. Mercier
14c64e26d3
Revert "Freeze all package processes before killing"
...
This reverts commit 6eff4d8f1b .
Reason for revert: b/236266655 zygote for a new process spawns in different process group before moving, which causes permanent freeze of all zygote processes.
Change-Id: Icd245a3a23bda26659b81a8b5b24682655649222
2022-06-16 23:51:50 +00:00
TreeHugger Robot
6ea7f6c7b0
Merge "Require CONFIG_HID_PLAYSTATION for DualSense key layout" into tm-dev-plus-aosp
2022-06-16 22:49:29 +00:00
Xin Li
ec8f45f692
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 195b02b570 -s ours
...
am skip reason: Merged-In Ia6e09648c74410ce5d14dd6b2032e59466034cb5 with SHA-1 0a3e8a46af is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2126143
Change-Id: Id614739a3bf51bdc15811e66e7d57b430706c8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:58:48 +00:00
Xin Li
c263a56b7b
[automerger skipped] Merge Android 12 QPR 3 am: 6811cf790c -s ours
...
am skip reason: Merged-In Ia6e09648c74410ce5d14dd6b2032e59466034cb5 with SHA-1 0a3e8a46af is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2126143
Change-Id: I1f7a548b6869158462e56dff2907f6d7f6445f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:57:10 +00:00
Beverly
307c7617f8
Add extra logs for skipping hideKeyguardViewAfterRemoteAnimation
...
To figure out why b/234593480 may be occurring.
Test: manual
Bug: 234593480
Change-Id: Id31259897fcbce8224304ade71a857405bb509cc
2022-06-16 19:37:28 +00:00
Xin Li
195b02b570
Merge "Merge Android 12 QPR 3"
2022-06-16 18:51:54 +00:00
Hui Yu
e101c5248c
Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: b8f5fadbf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121
Change-Id: I8cf6c82c2e47cbadd7bd4ed08f449108dbc29bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 18:32:38 +00:00
Automerger Merge Worker
d1a38e2f45
Merge "Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: f6743c032c" into tm-d1-dev-plus-aosp
2022-06-16 18:32:37 +00:00
Automerger Merge Worker
ac12f630c2
Merge "Merge "webview: add trace event for relro timeout." into tm-dev am: db243f1fe1 am: 4b90a5d9f4" into tm-d1-dev-plus-aosp
2022-06-16 18:32:30 +00:00
Hui Yu
fa083fb1c1
Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: f6743c032c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121
Change-Id: If407fc52cef5e9c478a39b275cb5f9ea808e9bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 18:32:30 +00:00
Richard (Torne) Coles
29a0a4174a
Merge "webview: add trace event for relro timeout." into tm-dev am: db243f1fe1 am: 4b90a5d9f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18888975
Change-Id: Id3722f66b422d851f47e62d3cc946cb69ac3e845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 18:32:26 +00:00
Richard (Torne) Coles
89e3195dea
Merge "webview: add trace event for relro timeout." into tm-dev am: db243f1fe1 am: d8aa1435cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18888975
Change-Id: I8793d2da9b663ed767e97c3ac908834d3a5b594d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 18:32:20 +00:00