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

am: 352d1c5721 Change-Id: I7a1ca4361398301b9d80c44bfed57d868790ea37
2017-06-16 20:54:41 +00:00
parent e970e47ab8 352d1c5721
commit e67952adc7
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
@@ -12591,6 +12591,7 @@ public class ActivityManagerService extends IActivityManager.Stub
                Binder.restoreCallingIdentity(ident);
            }
        }
+        closeSystemDialogs("setLockScreenShown");
    }

    @Override