commit | aa043c05545937b3e104e0298abd86b28504f389 | [log] [tgz] |
---|---|---|
author | Alex Johnston <acjohnston@google.com> | Mon Jun 27 20:07:24 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 27 20:07:24 2022 +0000 |
tree | d1ec2161d41389f21c45e8216e203406c6cc9ce2 | |
parent | 6a4f104b978f38ba7c13f7bf9d574da908ab1a01 [diff] | |
parent | 6b47a88416aeff0623df8515d5da5903faed30db [diff] |
Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec am: 6b10a7a317 am: 6b47a88416 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034752 Change-Id: I25fe78fee1568f5367c23602c7faaf15acd0678f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>