Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a7ad3f6c: am 50a21f4d: add reboot() method to PowerManager

Browse Source 
Merge commit 'a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0'

* commit 'a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0':
  add reboot() method to PowerManager
This commit is contained in:
Doug Zongker
2009-11-19 17:45:39 -08:00
committed by Android Git Automerger
parent 5e04bbc761 a7ad3f6c71
commit 608620da67
5 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/os/IPowerManager.aidl
View File

@@ -32,6 +32,7 @@ interface IPowerManager
void preventScreenOn(boolean prevent);
void setScreenBrightnessOverride(int brightness);
boolean isScreenOn();
void reboot(String reason);
// sets the brightness of the backlights (screen, keyboard, button) 0-255
void setBacklightBrightness(int brightness);

17
core/java/android/os/PowerManager.java
View File

@@ -465,6 +465,22 @@ public class PowerManager
}
}
/**
* Reboot the device. Will not return if the reboot is
* successful. Requires the {@link android.Manifest#REBOOT}
* permission.
*
* @param reason code to pass to the kernel (e.g., "recovery") to
* request special boot modes, or null.
*/
public void reboot(String reason)
{
try {
mService.reboot(reason);
} catch (RemoteException e) {
}
}
private PowerManager()
{
}
@@ -488,4 +504,3 @@ public class PowerManager
IPowerManager mService;
Handler mHandler;
}

4
core/res/AndroidManifest.xml
View File

@@ -943,7 +943,7 @@
<permission android:name="android.permission.DELETE_CACHE_FILES"
android:label="@string/permlab_deleteCacheFiles"
android:description="@string/permdesc_deleteCacheFiles"
android:protectionLevel="signature" />
android:protectionLevel="signatureOrSystem" />
<!-- Allows an application to delete packages. -->
<permission android:name="android.permission.DELETE_PACKAGES"
@@ -981,7 +981,7 @@
<permission android:name="android.permission.REBOOT"
android:label="@string/permlab_reboot"
android:description="@string/permdesc_reboot"
android:protectionLevel="signature" />
android:protectionLevel="signatureOrSystem" />
<!-- Allows low-level access to power management -->
<permission android:name="android.permission.DEVICE_POWER"