summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-10-01 10:13:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-01 10:13:52 -0700
commit843b014aca849a80fe1b2193dc53228f7a8525bd (patch)
tree532c5bfa9fe2f954e73ade0a78b22ec62cdc3a32 /tools
parent6c7169722f943f3cc2c23ac6b7469f2e7dc2358f (diff)
parent489c1e9f82250770004ec9080778546b040f6146 (diff)
downloadframeworks_base-843b014aca849a80fe1b2193dc53228f7a8525bd.zip
frameworks_base-843b014aca849a80fe1b2193dc53228f7a8525bd.tar.gz
frameworks_base-843b014aca849a80fe1b2193dc53228f7a8525bd.tar.bz2
am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
* commit '489c1e9f82250770004ec9080778546b040f6146': Get rid of preventScreenOn().
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java5
1 files changed, 0 insertions, 5 deletions
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 0cf0f21..e882440 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
@@ -65,11 +65,6 @@ public class BridgePowerManager implements IPowerManager {
}
@Override
- public void preventScreenOn(boolean arg0) throws RemoteException {
- // pass for now.
- }
-
- @Override
public void reboot(String arg0) throws RemoteException {
// pass for now.
}