summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alison Cichowlas <asc@google.com> 2017-06-16 20:54:41 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-16 20:54:41 +0000
commite67952adc73ef98bf06efa9bc61a9c6038e68a6e (patch)
tree5f4af96e7ae0a911919fc7a01396ba1ae346c3e1
parente970e47ab83acef475ef4760f7d3a079108443bf (diff)
parent352d1c57215323e25e81bd979e4c1ab8aafe23d4 (diff)
Merge "Hide power dialog when lockscreen comes and goes." into oc-dr1-dev am: c05a764e5e
am: 352d1c5721 Change-Id: I7a1ca4361398301b9d80c44bfed57d868790ea37
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index e61df81e0d36..a74f8b62a9c2 100644
--- 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