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

Merge "Fix no vibration during shutdown."

Browse Source
This commit is contained in:
John Spurlock
2015-04-30 12:22:38 +00:00
committed by Gerrit Code Review
parent 815d9bb178 d3b371755d
commit ad61b8336a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/power/ShutdownThread.java
View File

@@ -384,7 +384,7 @@ public final class ShutdownThread extends Thread {
}
}
rebootOrShutdown(mReboot, mRebootReason);
rebootOrShutdown(mContext, mReboot, mRebootReason);
}
private void shutdownRadios(int timeout) {
@@ -501,17 +501,18 @@ public final class ShutdownThread extends Thread {
* Do not call this directly. Use {@link #reboot(Context, String, boolean)}
* or {@link #shutdown(Context, boolean)} instead.
*
* @param context Context used to vibrate or null without vibration
* @param reboot true to reboot or false to shutdown
* @param reason reason for reboot
*/
public static void rebootOrShutdown(boolean reboot, String reason) {
public static void rebootOrShutdown(final Context context, boolean reboot, String reason) {
if (reboot) {
Log.i(TAG, "Rebooting, reason: " + reason);
PowerManagerService.lowLevelReboot(reason);
Log.e(TAG, "Reboot failed, will attempt shutdown instead");
} else if (SHUTDOWN_VIBRATE_MS > 0) {
} else if (SHUTDOWN_VIBRATE_MS > 0 && context != null) {
// vibrate before shutting down
Vibrator vibrator = new SystemVibrator();
Vibrator vibrator = new SystemVibrator(context);
try {
vibrator.vibrate(SHUTDOWN_VIBRATE_MS, VIBRATION_ATTRIBUTES);
} catch (Exception e) {

2
services/java/com/android/server/SystemServer.java
View File

@@ -288,7 +288,7 @@ public final class SystemServer {
reason = null;
}
ShutdownThread.rebootOrShutdown(reboot, reason);
ShutdownThread.rebootOrShutdown(null, reboot, reason);
}
}