Lais Andrade 55b9467f70 Merge "Fix PIN lock pattern not respecting user settings" into tm-dev am: 352d8d7abe ...

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

Change-Id: I9d6b5ec4c40c9bb7a201d7b5acda1d56b9a9d8f2

2022-03-24 00:49:15 +00:00

..

api

Merge "Add CrossTaskNavigations API to restrict navigation from current task" into tm-dev am: a4889a2180

2022-03-24 00:44:33 +00:00

java

Merge "Fix PIN lock pattern not respecting user settings" into tm-dev am: 352d8d7abe

2022-03-24 00:49:15 +00:00

jni

Merge "JavaBBinder::onTransact - log if env null" am: b344dfaee9 am: 5aa2bac382 am: 16294cce9e

2022-03-23 05:39:31 +00:00

proto

[conflict] Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev am: a3e1134c46

2022-03-23 13:56:01 +00:00

res

Merge "Protect CAN_INTERACT_ACROSS_PROFILES_CHANGED broadcast." into tm-dev am: cb2985a2ae

2022-03-24 00:37:59 +00:00

sysprop

…

tests

Merge changes from topic "revert-17199637-revert-17083643-large-icons-tm-XHQQYXZDHH-KIGUXQGTHZ" into tm-dev am: d27d7fe051 am: 01597ebcd9

2022-03-22 20:13:03 +00:00

xsd

…

TEST_MAPPING

…