From 644f9c3ad93f6674abff4143b78404cd222b5e30 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Tue, 25 Jan 2011 12:06:23 -0800
Subject: [PATCH] Make FLAG_FULLSCREEN not go into lights out mode anymore.

Change-Id: I4a0aa8789f537717f82df4efb6a35108e1ab1784
---
 .../android/internal/statusbar/IStatusBarService.aidl   |  1 -
 .../internal/policy/impl/PhoneWindowManager.java        |  9 ++-------
 .../com/android/server/StatusBarManagerService.java     | 17 -----------------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
index d83a53497141..d1ea52e8863b 100644
--- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -30,7 +30,6 @@ interface IStatusBarService
     void setIcon(String slot, String iconPackage, int iconId, int iconLevel);
     void setIconVisibility(String slot, boolean visible);
     void removeIcon(String slot);
-    void setActiveWindowIsFullscreen(boolean fullscreen);
     void setMenuKeyVisible(boolean visible);
     void setIMEButtonVisible(in IBinder token, boolean visible);
 
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 9b5c42e158a3..d2a4823df4a3 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1892,14 +1892,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 + (topNeedsMenu ? "needs" : "does not need")
                 + " the MENU key");
 
-        final boolean changedFullscreen = (mTopIsFullscreen != topIsFullscreen);
+        mTopIsFullscreen = topIsFullscreen;
         final boolean changedMenu = (topNeedsMenu != mShowMenuKey);
 
-        if (changedFullscreen || changedMenu) {
-            final boolean topIsFullscreenF = topIsFullscreen;
+        if (changedMenu) {
             final boolean topNeedsMenuF = topNeedsMenu;
 
-            mTopIsFullscreen = topIsFullscreen;
             mShowMenuKey = topNeedsMenu;
 
             mHandler.post(new Runnable() {
@@ -1918,9 +1916,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                                 if (changedMenu) {
                                     sbs.setMenuKeyVisible(topNeedsMenuF);
                                 }
-                                if (changedFullscreen) {
-                                    sbs.setActiveWindowIsFullscreen(topIsFullscreenF);
-                                }
                             } catch (RemoteException e) {
                                 // This should be impossible because we're in the same process.
                                 mStatusBarService = null;
diff --git a/services/java/com/android/server/StatusBarManagerService.java b/services/java/com/android/server/StatusBarManagerService.java
index 50ea3fa351b8..86b8bc619dc2 100644
--- a/services/java/com/android/server/StatusBarManagerService.java
+++ b/services/java/com/android/server/StatusBarManagerService.java
@@ -284,23 +284,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub
     }
 
     /**
-     * This is used for the automatic version of lights-out mode.  Only call this from
-     * the window manager.
-     *
-     * @see setLightsOn(boolean)
-     */
-    public void setActiveWindowIsFullscreen(boolean fullscreen) {
-        // We could get away with a separate permission here, but STATUS_BAR is
-        // signatureOrSystem which is probably good enough.  There is no public API
-        // for this, so the question is a security issue, not an API compatibility issue.
-        enforceStatusBar();
-
-        synchronized (mLock) {
-            updateLightsOnLocked(!fullscreen);
-        }
-    }
-
-    /**
      * This is used for the user-controlled version of lights-out mode.  Only call this from
      * the status bar itself.
      *
-- 
2.11.0