OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ce09247
b98e235
)
am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-relat...
author
Yusuke Sato
<yusukes@google.com>
Fri, 31 Jul 2015 23:34:06 +0000
(23:34 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 31 Jul 2015 23:34:06 +0000
(23:34 +0000)
* commit '
b98e235364c2b221521f622c546733b2862e4677
':
Distinguish user-requested shutdown from power-related ones
1
2
cmds/svc/src/com/android/commands/svc/PowerCommand.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/content/Intent.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/os/IPowerManager.aidl
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/os/PowerManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/power/PowerManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/power/ShutdownThread.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/wm/WindowManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cmds/svc/src/com/android/commands/svc/PowerCommand.java
Simple merge
diff --cc
core/java/android/content/Intent.java
Simple merge
diff --cc
core/java/android/os/IPowerManager.aidl
index
0f37ac7
,
4d6241b
..
c4f62ba
---
1
/
core/java/android/os/IPowerManager.aidl
---
2
/
core/java/android/os/IPowerManager.aidl
+++ b/
core/java/android/os/IPowerManager.aidl
@@@
-43,10
-43,9
+43,10
@@@
interface IPowerManage
boolean isInteractive();
boolean isPowerSaveMode();
boolean setPowerSaveMode(boolean mode);
+ boolean isDeviceIdleMode();
void reboot(boolean confirm, String reason, boolean wait);
- void shutdown(boolean confirm, boolean wait);
+ void shutdown(boolean confirm,
String reason,
boolean wait);
void crash(String message);
void setStayOnSetting(int val);
diff --cc
core/java/android/os/PowerManager.java
Simple merge
diff --cc
services/core/java/com/android/server/power/PowerManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/power/ShutdownThread.java
Simple merge
diff --cc
services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
diff --cc
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
Simple merge