am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev

* commit 'fe7e94a094746b608eb926fadc3ee1446bbb0d58':
  Add isSafeModeEnabled() API to WindowManagerService

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();
 }

services/java/com/android/server/wm/WindowManagerService.java

@@ -10348,6 +10348,10 @@ public class WindowManagerService extends IWindowManager.Stub
         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)");
         mPolicy.dump("    ", pw, args);

tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

@@ -447,6 +447,11 @@ public class IWindowManagerImpl implements IWindowManager {
         // TODO Auto-generated method stub
     }
     
+    @Override
+    public boolean isSafeModeEnabled() {
+        return false;
+    }
+
     @Override
     public IBinder getFocusedWindowToken() {
         // TODO Auto-generated method stub