diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-07 11:13:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-07 11:13:48 -0800 |
| commit | fe7e94a094746b608eb926fadc3ee1446bbb0d58 (patch) | |
| tree | b3523e22aa61480840b49cd0e35fbda34ca98cbe /services/java | |
| parent | 2f4be247b647cdbe433ff35d30aa54b131e6bd2a (diff) | |
| parent | 088fb915f73584fbeaf05f5cbaa95b8a944b94cb (diff) | |
| download | frameworks_base-fe7e94a094746b608eb926fadc3ee1446bbb0d58.zip frameworks_base-fe7e94a094746b608eb926fadc3ee1446bbb0d58.tar.gz frameworks_base-fe7e94a094746b608eb926fadc3ee1446bbb0d58.tar.bz2 | |
am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
Add isSafeModeEnabled() API to WindowManagerService
Diffstat (limited to 'services/java')
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 0659409..4659c9d 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -10347,6 +10347,10 @@ public class WindowManagerService extends IWindowManager.Stub public void lockNow(Bundle options) { mPolicy.lockNow(options); } + + public boolean isSafeModeEnabled() { + return mSafeMode; + } void dumpPolicyLocked(PrintWriter pw, String[] args, boolean dumpAll) { pw.println("WINDOW MANAGER POLICY STATE (dumpsys window policy)"); |