Betty Chang
aaec02b881
Merge "[LE] Broadcast API integration for MediaOutputBroadcastDialog" into tm-dev
2022-04-29 13:58:28 +00:00
Paul Duffin
5ec5a80c8a
Merge "Remove unnecessary work around for updatable-media" into tm-dev
2022-04-29 12:22:07 +00:00
Christian Göllner
fa9d138be0
Merge "[Motion] Split-shade expansion: implement over scroll effect [v1]" into tm-dev
2022-04-29 12:14:23 +00:00
Victor Chang
ca88bd0806
Merge "Revert "[SettingsProvider] enforce permission on openFile"" into tm-dev
2022-04-29 12:05:08 +00:00
Songchun Fan
3726d5247a
Revert "[SettingsProvider] enforce permission on openFile"
...
This reverts commit 5b50cebd18 .
Reason for revert: should check appops permission instead because the permission is granted upon user approval
Bug: 230791848
Change-Id: Icc86eb38372753a5f6aa8b91918ecb4b120c1fa8
2022-04-29 12:04:22 +00:00
Naomi Musgrave
439a7fe9a0
Merge "Only return ROTATION_0 for WM#getPossibleMaximumWindowMetrics" into tm-dev
2022-04-29 11:33:01 +00:00
Mark Renouf
21469e70d6
Merge "Fix an NPE on cancellation when connection is closed" into tm-dev
2022-04-29 10:42:21 +00:00
Riddle Hsu
305e94ce08
Merge "Attempt to use snapshot starting window for task trampoline" into tm-dev
2022-04-29 10:38:08 +00:00
Jonathan Scott
0ba2ac86ab
Merge "Temporarily remove CtsDomainVerificationDeviceMultiUserTestCases from presubmit." into tm-dev
2022-04-29 09:55:51 +00:00
Ayush Sharma
4d2ea02b88
Merge "Enforce guards against crash command via shell" into tm-dev
2022-04-29 09:46:05 +00:00
Naomi Musgrave
86e40f73a0
Only return ROTATION_0 for WM#getPossibleMaximumWindowMetrics
...
Do not return every rotation for window metrics.
Bug: 228288352
Test: atest WmTests:PossibleDisplayInfoMapperTests
Change-Id: I756b079bfce09cf618500f3d07547ec94ac60694
2022-04-29 09:02:20 +00:00
Riddle Hsu
e0d2119461
Merge "Reduce overhead of activity launch observer" into tm-dev
2022-04-29 08:40:04 +00:00
Siim Sammul
1b81993295
Merge "Fix a bug where error count was reset before returning it." into tm-dev
2022-04-29 08:09:45 +00:00
TreeHugger Robot
7b5e80f2f6
Merge "Use Launcher smartspace instead of SysUI's for the shared element transition." into tm-dev
2022-04-29 07:46:23 +00:00
Jerry Chang
535fbd5b46
Merge "Skip running app pair flicker tests since it's deprecated" into tm-dev
2022-04-29 06:56:20 +00:00
Iris Yang
300f68deaf
Merge "Don't show KeyguardPresentation on the display which is always unlocked" into tm-dev
2022-04-29 06:45:48 +00:00
Tony Huang
af014f9eb6
Merge "Support exit to full screen to non-split app" into tm-dev
2022-04-29 06:28:58 +00:00
Tom Hsu
a2a6d8847f
Merge "Add function of text hyphenate to buttons." into tm-dev
2022-04-29 05:51:12 +00:00
Josh Tsuji
ddfe8bda75
Use Launcher smartspace instead of SysUI's for the shared element transition.
...
See justification/explanation in linked bug.
I re-ordered some methods in the unlock controller so they'd make more sense,
they're generally called from top to bottom now during the unlock sequence.
Bug: 229890190
Fixes: 227713319
Test: atest SystemUITests
Test: manual
Merged-In: I58fa437eea183691ff29548143664698498c2105
Change-Id: I58fa437eea183691ff29548143664698498c2105
2022-04-29 05:40:54 +00:00
Super Liu
06f855f07c
Merge "Revert "Fix stale View tracking in ShadeViewDiffer"" into tm-dev
2022-04-29 05:31:31 +00:00
TreeHugger Robot
992c55b46f
Merge "Fix animation target rule due to split screen arch change" into tm-dev
2022-04-29 05:13:31 +00:00
Julia Reynolds
9caec02cb7
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev
2022-04-29 05:11:26 +00:00
Calvin Pan
f71832b46b
Merge "Fix empty resource showing "Und"" into tm-dev
2022-04-29 03:55:52 +00:00
Betty Chang
93dce8605b
Merge "[LE] Add intent action for MediaOutputBroadcastDialog" into tm-dev
2022-04-29 03:33:56 +00:00
Sam Dubey
4cac1be2ee
Merge "Revert "Allow activity in ActivityEmbedding split to get Task windowing mode"" into tm-dev
2022-04-29 02:44:43 +00:00
Sam Dubey
0dc147eeee
Revert "Allow activity in ActivityEmbedding split to get Task windowing mode"
...
This reverts commit 0522842a34 .
Reason for revert: Breaking PlatformScenarioTests Tests due to NPE
Bug: 230793322
Change-Id: Ib6a9a1b7fb1c95681fc7a1bb959da5618b840f16
2022-04-29 01:49:39 +00:00
Shawn Lin
efade0b934
Merge "Apply display ratio to cutout protection" into tm-dev
2022-04-29 01:44:21 +00:00
Milton Wu
7cbaf98546
Merge "Access mCurrentOperation in main handler" into tm-dev
2022-04-29 01:17:31 +00:00
Tiger Huang
77305dced2
Merge "Skip updating DisplayFrames when everything is the same" into tm-dev
2022-04-29 01:15:50 +00:00
Li Li
e8bd13a593
Revert "Fix stale View tracking in ShadeViewDiffer"
...
This reverts commit 0b0791615e .
Reason for revert: b/230793120
Change-Id: I358fc8f0f7ee7c3c3047567f2cf460e33d1f538a
2022-04-29 00:19:23 +00:00
Iris Yang
07550e290b
Don't show KeyguardPresentation on the display which is always unlocked
...
It's already the case that always unlocked display are in their own
group, so with the existing logic we wont' show KeyguardPresentation on
them. It's displays that are NOT always unlocked but also in a
non-default group that we're changing to show KeyguardPresentation on.
Bug: 218587709
Test: atest KeyguardDisplayManagerTest
Change-Id: Idf1f71b59941daeb30f1bef3d87717e01e8d8f0f
2022-04-28 23:56:47 +00:00
TreeHugger Robot
48d602a8a6
Merge "Avoid alarm lock when calling outside" into tm-dev
2022-04-28 23:39:17 +00:00
Paul Duffin
365021f866
Remove unnecessary work around for updatable-media
...
Bug: 190807367
Bug: 229932396
Test: m framework-all
Change-Id: I70590910144141a534b926f884e9f08e4e3af5ca
2022-04-28 22:35:53 +00:00
Songchun Fan
a645831a69
Merge "[pm] remove some tests from staged platinum tests" into tm-dev
2022-04-28 22:30:16 +00:00
TreeHugger Robot
476efd5f8b
Merge "Fix the issue widget retore doesn't play well with work profile" into tm-dev
2022-04-28 22:02:36 +00:00
Sudheer Shanka
9167516120
Merge "Remove ConnOnActivityStartTest." into tm-dev
2022-04-28 21:59:29 +00:00
Sudheer Shanka
7f8e1c17d9
Merge "Fix failure in testUpdateOomAdj_UidIdle_StopService." into tm-dev
2022-04-28 21:58:45 +00:00
Bryce Lee
493062c55e
Merge "Unbind from dream overlay in onUnbind." into tm-dev
2022-04-28 21:57:18 +00:00
Nate Myren
7585a9580d
Merge "Show Notification Permission dialog on (some) task trampolines" into tm-dev
2022-04-28 21:49:15 +00:00
Shashwat Razdan
19a8270160
Merge "Validating service components after reading them from resources" into tm-dev
2022-04-28 21:32:31 +00:00
Rachel Lee
fa426b9d49
Merge "Remove getLatestVsyncEventData in Choreographer." into tm-dev
2022-04-28 21:29:54 +00:00
TreeHugger Robot
a347b6c2e6
Merge "Restore V2+ signature requirement for system apps" into tm-dev
2022-04-28 20:56:41 +00:00
Lucas Silva
964c0704c5
Merge "Dismiss dream when activities are started while dreaming." into tm-dev
2022-04-28 20:55:18 +00:00
Wenhao Wang
4b21d21a5d
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724
Change-Id: I0cb4c055fb8318b0f76d39b99a70e7eafecdb243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:50:50 +00:00
Wenhao Wang
05d1dd3df1
[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours am: 3506ab2cc7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724
Change-Id: I8e432acebc86ef1b6c9182a823ccfd72d08beb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:50:39 +00:00
Presubmit Automerger Backend
5c3e5e005b
[automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours am: ba093891a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875442
Change-Id: If1e6edaa78cfe8f07c17951348f1d5554e544f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:50:19 +00:00
Wenhao Wang
6fb87bd8a5
[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev am: 06439d0860 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724
Change-Id: Ie43289c0263d5edbee58d177cba7932af0e67121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:41:17 +00:00
Wenhao Wang
3506ab2cc7
[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724
Change-Id: Ia90c7622629c8d2a8c2148827c99304b2b60b504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:40:54 +00:00
Presubmit Automerger Backend
ba093891a1
[automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875442
Change-Id: I182375ab3aa34f914fdb33bdce04c0ceabbf6792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:40:34 +00:00
Wenhao Wang
e32e565af6
[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev am: 7c4f648b0f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880725
Change-Id: Ie3b8790618561f91d469f68d77cf82181de13bcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:39:04 +00:00