From 120664816a9bf325b618d8dd40febae2e3636ec8 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Fri, 28 Sep 2012 18:21:36 -0700
Subject: [PATCH] Get rid of preventScreenOn().

Bug: 7165399
Change-Id: I1968265ecd74fff4d85efd2ca03b1983425ea518
---
 core/java/android/os/IPowerManager.aidl                     | 1 -
 .../java/com/android/server/power/PowerManagerService.java  | 6 ------
 .../layoutlib/bridge/android/BridgePowerManager.java        | 5 -----
 3 files changed, 12 deletions(-)

diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl
index eec19cb8c3b96..8bfefd40f6c9b 100644
--- a/core/java/android/os/IPowerManager.aidl
+++ b/core/java/android/os/IPowerManager.aidl
@@ -44,7 +44,6 @@ interface IPowerManager
     void setPokeLock(int pokey, IBinder lock, String tag);
     void setStayOnSetting(int val);
     void setMaximumScreenOffTimeoutFromDeviceAdmin(int timeMs);
-    void preventScreenOn(boolean prevent);
 
     // temporarily overrides the screen brightness settings to allow the user to
     // see the effect of a settings change without applying it immediately
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java
index ad138e80140b7..9f212169f5c79 100644
--- a/services/java/com/android/server/power/PowerManagerService.java
+++ b/services/java/com/android/server/power/PowerManagerService.java
@@ -1644,12 +1644,6 @@ public final class PowerManagerService extends IPowerManager.Stub
                 && mMaximumScreenOffTimeoutFromDeviceAdmin < Integer.MAX_VALUE;
     }
 
-    @Override // Binder call
-    public void preventScreenOn(boolean prevent) {
-        // TODO Auto-generated method stub
-        // Only used by phone app, delete this
-    }
-
     /**
      * Used by the phone application to make the attention LED flash when ringing.
      */
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
index 0cf0f21ae0a84..e882440f92744 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
@@ -64,11 +64,6 @@ public class BridgePowerManager implements IPowerManager {
         // pass for now.
     }
 
-    @Override
-    public void preventScreenOn(boolean arg0) throws RemoteException {
-        // pass for now.
-    }
-
     @Override
     public void reboot(String arg0) throws RemoteException {
         // pass for now.