From c428aae6429c3fd5e2037c3793af399d9f6e23bf Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 3 Oct 2012 16:38:22 -0700 Subject: 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 --- .../com/android/layoutlib/bridge/android/BridgePowerManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools') 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. } -- cgit v1.1