Merge "Get rid of preventScreenOn()." into jb-mr1-dev

Author: Jeff Brown

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

services/java/com/android/server/power/PowerManagerService.java

@@ -1643,12 +1643,6 @@ private boolean isMaximumScreenOffTimeoutFromDeviceAdminEnforcedLocked() {
                 && 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.
      */

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java

@@ -64,11 +64,6 @@ public void nap(long arg0) throws RemoteException {
         // 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.