Merge "Hide power dialog when lockscreen comes and goes." into oc-dr1-dev

am: c05a764e5e Change-Id: Id9b37d40c09fd27e405c13977925bf4beb37175f
2017-06-16 20:36:12 +00:00
parent cd40b9993e c05a764e5e
commit 352d1c5721
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -12563,6 +12563,7 @@ public class ActivityManagerService extends IActivityManager.Stub
                Binder.restoreCallingIdentity(ident);
            }
        }
+        closeSystemDialogs("setLockScreenShown");
    }

    @Override