diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-10-03 16:38:22 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2012-10-03 18:07:23 -0700 |
commit | c428aae6429c3fd5e2037c3793af399d9f6e23bf (patch) | |
tree | ea5452cc311e5440b6e3dbce5f856fbc8915b653 /tools | |
parent | 2e307a61a3730e6b65906f575d85258b197e3494 (diff) | |
download | frameworks_base-c428aae6429c3fd5e2037c3793af399d9f6e23bf.zip frameworks_base-c428aae6429c3fd5e2037c3793af399d9f6e23bf.tar.gz frameworks_base-c428aae6429c3fd5e2037c3793af399d9f6e23bf.tar.bz2 |
Fix issue #7267494, issue #7212347
7267494 Calendar is not syncing
Check for whether a content provider is dead before returning
it. This is kind-of a band-aid, but probably the right thing
to do; I'm just not sure exactly the full details of why this
problem is happening. Hopefully this "fixes" it, though I don't
have a way to repro to tell.
7212347 System power off dialog is only visible to user 0
Make it visible. Also turn on some battery debugging stuff and
clean it up so we can just keep it.
Change-Id: I5add25bf2a763c8dfe1df23bc5c753a9ea5d157a
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. } |