diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-10-03 18:47:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-03 18:47:51 -0700 |
| commit | cd09cb8fb79442aa22018db9134ef1ef22059360 (patch) | |
| tree | 5d738287c0b31f3547ad3e5fc1374ee59a00527f /tools | |
| parent | a521abef83bc329931ef9b8230fe1ae9e1a87b3a (diff) | |
| parent | 6fb7fd3a0939413d8968fc0d404ed499d7f7dc52 (diff) | |
| download | frameworks_base-cd09cb8fb79442aa22018db9134ef1ef22059360.zip frameworks_base-cd09cb8fb79442aa22018db9134ef1ef22059360.tar.gz frameworks_base-cd09cb8fb79442aa22018db9134ef1ef22059360.tar.bz2 | |
am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev
* commit '6fb7fd3a0939413d8968fc0d404ed499d7f7dc52':
Fix issue #7267494, issue #7212347
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java | 7 |
1 files changed, 6 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 5e23f24..1ccbc40 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 @@ -60,7 +60,12 @@ public class BridgePowerManager implements IPowerManager { } @Override - public void reboot(String arg0) throws RemoteException { + public void reboot(boolean confirm, String reason, boolean wait) { + // pass for now. + } + + @Override + public void shutdown(boolean confirm, boolean wait) { // pass for now. } |