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 /core/java/android/os | |
| 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 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/IPowerManager.aidl | 3 | ||||
| -rw-r--r-- | core/java/android/os/PowerManager.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 557d3f3..6d6d147 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -37,7 +37,8 @@ interface IPowerManager void nap(long time); boolean isScreenOn(); - void reboot(String reason); + void reboot(boolean confirm, String reason, boolean wait); + void shutdown(boolean confirm, boolean wait); void crash(String message); void setStayOnSetting(int val); diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index ae50ddb..fb02c0a 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -596,7 +596,7 @@ public final class PowerManager { */ public void reboot(String reason) { try { - mService.reboot(reason); + mService.reboot(false, reason, true); } catch (RemoteException e) { } } |