Tom Hsu
a2a6d8847f
Merge "Add function of text hyphenate to buttons." into tm-dev
2022-04-29 05:51:12 +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
TreeHugger Robot
48d602a8a6
Merge "Avoid alarm lock when calling outside" into tm-dev
2022-04-28 23:39:17 +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
Wenhao Wang
675f29e0ef
[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 62845d9af7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880725
Change-Id: I9c4e7b18c839116bc52a7a74052cf6c9233d9357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:38:51 +00:00
James O'Leary
ee74679e85
Merge changes from topic "variants_landing" into tm-dev
...
* changes:
Add color scheme constructor that takes WallpaperColors & Style objects
Adjust variants specs to match latest UX spec.
2022-04-28 20:31:19 +00:00
Wenhao Wang
7c4f648b0f
Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev
2022-04-28 19:46:33 +00:00
Wenhao Wang
06439d0860
Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev
2022-04-28 19:46:19 +00:00
Wenhao Wang
5ada3e16cf
Merge changes from topic "lockdown-mode-qt-dev-rvc-dev-sc-dev" into tm-dev
...
* changes:
[automerged blank] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 2p: d6a8e6d013
[automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8
DO NOT MERGE Suppress notifications when device enter lockdown
2022-04-28 19:45:44 +00:00
Steve Elliott
502a44e15a
Merge "Use correct groupKey API for notif groups" into tm-dev
2022-04-28 19:10:18 +00:00
Shashwat Razdan
b7a2453357
Validating service components after reading them from resources
...
Bug: 230058432
Test: CTS tests, tested with Launcher -> AiAi -> Play colab
Change-Id: I9d076412184fc3965680eb7398f7a75bc7813c96
2022-04-28 11:45:50 -07:00
Bryce Lee
1da50a201b
Unbind from dream overlay in onUnbind.
...
If a dream is unbound before finish, unbinding from the overlay service
will not occur before onDestroy. This will result in an exception from
unbinding from a non registered service. This change ensures the dream
service unbinds from the overlay service when unbound.
Test: atest DreamManagerServiceTests#testForceStopStubbornDream
Fixed: 229824204
Change-Id: Id708b9119c5498bf9632b21a539c3ca7f5506737
2022-04-28 17:57:38 +00:00
Josh Tsuji
50f19f212e
Merge changes Iee97d469,Ica1b552a into tm-dev
...
* changes:
fadeInSurfaceBehind() when the remote animation starts.
Clear task snapshot when we showSurfaceBehindKeyguard.
2022-04-28 17:52:10 +00:00
Songchun Fan
4932b90c4f
[pm] remove some tests from staged platinum tests
...
The remaining tests have a low flakiness rate and a total runtime < 30mins.
BUG: 140252512
Test: n/a
Change-Id: Ic7631db5fd4e3c28a7b7cbe464bf46be93c4c05c
2022-04-28 17:41:09 +00:00
Kiwon Park
c49ba33ac0
Merge "Log TelephonyAnomalyDetected event from AnomalyReporter" into tm-dev
2022-04-28 17:25:04 +00:00
Nikita Dubrovsky
0f9f5f9379
Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev
2022-04-28 17:16:32 +00:00
Salud Lemus
7977353cd2
Merge "Update canSilentlyInstallPackage DPMS API for financed device owner" into tm-dev
2022-04-28 17:16:13 +00:00
Prabal Singh
c39095ff0f
Merge "Edit workPolicyUtil constructor" into tm-dev
2022-04-28 17:12:28 +00:00
Pinyao Ting
8692663803
Fix the issue widget retore doesn't play well with work profile
...
This CL addresses a logic flaw which leads to widgets from packages
pending restore being remvoed after work profile restore has started.
Bug: 229174907
Test: manual
Change-Id: I77bcc611560f0c2813f911bf234fe6afb8ae5b2f
2022-04-28 09:30:32 -07:00
Yu-Han Yang
76de9f1eab
Merge "Hold the reference of TelephonyCallback" into tm-dev
2022-04-28 16:27:04 +00:00
TreeHugger Robot
23765fcbb6
Merge "Fix IME layering issue by non-focusable IME target overlay" into tm-dev
2022-04-28 16:23:02 +00:00
Lyn Han
11bfc9677d
Merge "Fix notification shelf issues" into tm-dev
2022-04-28 16:19:15 +00:00
TreeHugger Robot
26e995aaf0
Merge "Fixes UMS.getPreCreatedUserLU() to ignore partial pre-created users." into tm-dev
2022-04-28 16:18:15 +00:00
Songchun Fan
0cb62fa9c7
Merge "[SettingsProvider] enforce permission on openFile" into tm-dev
2022-04-28 16:00:04 +00:00