diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-15 22:56:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:56:39 +0000 |
| commit | de5cc88306cccdfe998ffafed4830b5db45b2ffd (patch) | |
| tree | dde60fdfc85680fb2ca25b7e7deaba6d9279cd82 | |
| parent | 6e4997dbfb5f0a2abac99522a52b557172757ee2 (diff) | |
| parent | f57b5e6f23b9ec6f98d4af75072b87b09303e62d (diff) | |
| download | frameworks_base-de5cc88306cccdfe998ffafed4830b5db45b2ffd.zip frameworks_base-de5cc88306cccdfe998ffafed4830b5db45b2ffd.tar.gz frameworks_base-de5cc88306cccdfe998ffafed4830b5db45b2ffd.tar.bz2 | |
am f57b5e6f: am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev
* commit 'f57b5e6f23b9ec6f98d4af75072b87b09303e62d':
Fix build.
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java | 2 |
1 files changed, 1 insertions, 1 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 085df85..895f9c9 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 @@ -137,7 +137,7 @@ public class BridgePowerManager implements IPowerManager { } @Override - public void wakeUp(long time) throws RemoteException { + public void wakeUp(long time, String reason, String opPackageName) throws RemoteException { // pass for now. } |