Kholoud Mohamed 2ca56df0db Merge changes from topic "cherrypicker-L96900000953714853:N25700001248135378" ...

* changes:
  RESTRICT AUTOMERGE move device policy resource APIs to a separate class
  RESTRICT AUTOMERGE hide device policy resources constants

2022-03-29 11:01:20 +00:00

..

api

Merge changes from topic "cherrypicker-L96900000953714853:N25700001248135378"

2022-03-29 11:01:20 +00:00

java

Merge changes from topic "cherrypicker-L96900000953714853:N25700001248135378"

2022-03-29 11:01:20 +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 "Update user consent dialog for device log access" into tm-dev am: adf9921ee4

2022-03-28 16:34:08 +00:00

sysprop

…

tests

Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class"

2022-03-29 11:01:20 +00:00

xsd

…

TEST_MAPPING

…