summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-10-03 20:51:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-03 20:51:36 +0000
commitfb45a2e9cde403c4bb7ac62195795bcfad4b8da6 (patch)
tree6b0815f009a0b2451c4350fa335ce9fa8781e4ea /tools/layoutlib
parent093318eeac4fd839c722a902612c2f00e1da2f71 (diff)
parent7e6f2ee4d22bc40c5aa1f01a6bacb91a34cab3c0 (diff)
downloadframeworks_base-fb45a2e9cde403c4bb7ac62195795bcfad4b8da6.zip
frameworks_base-fb45a2e9cde403c4bb7ac62195795bcfad4b8da6.tar.gz
frameworks_base-fb45a2e9cde403c4bb7ac62195795bcfad4b8da6.tar.bz2
Merge "Fix layoutlib build" into klp-dev
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java6
1 files changed, 6 insertions, 0 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 6fd5acc..a8b58aa 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
@@ -45,6 +45,12 @@ public class BridgePowerManager implements IPowerManager {
}
@Override
+ public void acquireWakeLockWithUid(IBinder arg0, int arg1, String arg2, String arg2_5, int arg3)
+ throws RemoteException {
+ // pass for now.
+ }
+
+ @Override
public void crash(String arg0) throws RemoteException {
// pass for now.
}