diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-05 20:05:22 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-11-05 20:27:38 -0800 |
| commit | bfec0a8616bc197ee3b7b71be6fed1939d0c3c4d (patch) | |
| tree | 72832bb9442488065ceae24e5d1ade9297d9f584 | |
| parent | bb8abae507119612b4168b951354516b0bf7112d (diff) | |
| download | frameworks_base-bfec0a8616bc197ee3b7b71be6fed1939d0c3c4d.zip frameworks_base-bfec0a8616bc197ee3b7b71be6fed1939d0c3c4d.tar.gz frameworks_base-bfec0a8616bc197ee3b7b71be6fed1939d0c3c4d.tar.bz2 | |
Add isSafeModeEnabled() API to WindowManagerService
This adds a means of determining when the device is in safe mode,
as required by keyguard to disabled some features.
Change-Id: I31d357e6738c92e1837f9e0263e5f3f4de66315a
3 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 5f598b1..fdaf39e 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -254,4 +254,9 @@ interface IWindowManager * Gets the infos for all visible windows. */ void getVisibleWindowsForDisplay(int displayId, out List<WindowInfo> outInfos); + + /** + * Device is in safe mode. + */ + boolean isSafeModeEnabled(); } 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)"); diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java index da736b7..fa2cb50 100644 --- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java +++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java @@ -446,6 +446,11 @@ public class IWindowManagerImpl implements IWindowManager { public void lockNow(Bundle options) { // TODO Auto-generated method stub } + + @Override + public boolean isSafeModeEnabled() { + return false; + } @Override public IBinder getFocusedWindowToken() { |