Loading services/core/java/com/android/server/power/ShutdownThread.java +6 −7 Original line number Diff line number Diff line Loading @@ -28,7 +28,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManagerInternal; import android.media.AudioAttributes; import android.os.FileUtils; import android.os.Handler; import android.os.PowerManager; Loading @@ -41,6 +40,8 @@ import android.os.SystemVibrator; import android.os.Trace; import android.os.UserHandle; import android.os.UserManager; import android.os.VibrationAttributes; import android.os.VibrationEffect; import android.os.Vibrator; import android.telephony.TelephonyManager; import android.util.ArrayMap; Loading Loading @@ -99,11 +100,6 @@ public final class ShutdownThread extends Thread { // static instance of this thread private static final ShutdownThread sInstance = new ShutdownThread(); private static final AudioAttributes VIBRATION_ATTRIBUTES = new AudioAttributes.Builder() .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) .build(); // Metrics that will be reported to tron after reboot private static final ArrayMap<String, Long> TRON_METRICS = new ArrayMap<>(); Loading Loading @@ -700,7 +696,10 @@ public final class ShutdownThread extends Thread { // vibrate before shutting down Vibrator vibrator = new SystemVibrator(context); try { vibrator.vibrate(SHUTDOWN_VIBRATE_MS, VIBRATION_ATTRIBUTES); vibrator.vibrate( VibrationEffect.createOneShot( SHUTDOWN_VIBRATE_MS, VibrationEffect.DEFAULT_AMPLITUDE), VibrationAttributes.createForUsage(VibrationAttributes.USAGE_TOUCH)); } catch (Exception e) { // Failure to vibrate shouldn't interrupt shutdown. Just log it. Log.w(TAG, "Failed to vibrate during shutdown.", e); Loading Loading
services/core/java/com/android/server/power/ShutdownThread.java +6 −7 Original line number Diff line number Diff line Loading @@ -28,7 +28,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManagerInternal; import android.media.AudioAttributes; import android.os.FileUtils; import android.os.Handler; import android.os.PowerManager; Loading @@ -41,6 +40,8 @@ import android.os.SystemVibrator; import android.os.Trace; import android.os.UserHandle; import android.os.UserManager; import android.os.VibrationAttributes; import android.os.VibrationEffect; import android.os.Vibrator; import android.telephony.TelephonyManager; import android.util.ArrayMap; Loading Loading @@ -99,11 +100,6 @@ public final class ShutdownThread extends Thread { // static instance of this thread private static final ShutdownThread sInstance = new ShutdownThread(); private static final AudioAttributes VIBRATION_ATTRIBUTES = new AudioAttributes.Builder() .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) .build(); // Metrics that will be reported to tron after reboot private static final ArrayMap<String, Long> TRON_METRICS = new ArrayMap<>(); Loading Loading @@ -700,7 +696,10 @@ public final class ShutdownThread extends Thread { // vibrate before shutting down Vibrator vibrator = new SystemVibrator(context); try { vibrator.vibrate(SHUTDOWN_VIBRATE_MS, VIBRATION_ATTRIBUTES); vibrator.vibrate( VibrationEffect.createOneShot( SHUTDOWN_VIBRATE_MS, VibrationEffect.DEFAULT_AMPLITUDE), VibrationAttributes.createForUsage(VibrationAttributes.USAGE_TOUCH)); } catch (Exception e) { // Failure to vibrate shouldn't interrupt shutdown. Just log it. Log.w(TAG, "Failed to vibrate during shutdown.", e); Loading