diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-09-28 11:09:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 11:09:22 -0700 |
| commit | 01996793dd2a70acb0ae006960c23c31f0e39d5f (patch) | |
| tree | 8fa23b717039cde61f8c377849f6e56190034530 /services/java/com/android/server/am/ActivityManagerService.java | |
| parent | 9dbbfcda81f251f23aded866f7f9d49d8a744c75 (diff) | |
| parent | bc4ba82335c091cebaaee8b20987a61fb54c1727 (diff) | |
| download | frameworks_base-01996793dd2a70acb0ae006960c23c31f0e39d5f.zip frameworks_base-01996793dd2a70acb0ae006960c23c31f0e39d5f.tar.gz frameworks_base-01996793dd2a70acb0ae006960c23c31f0e39d5f.tar.bz2 | |
Merge "Remove user switcher from long-press power menu" into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server/am/ActivityManagerService.java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index bfefe67..5319db9 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -14057,6 +14057,7 @@ public final class ActivityManagerService extends ActivityManagerNative return false; } + mWindowManager.lockNow(); mWindowManager.startFreezingScreen(R.anim.screen_user_exit, R.anim.screen_user_enter); |