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

Merge "Add a rolling log of external vibrations" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-07 15:04:37 +00:00
committed by Android (Google) Code Review
parent 31167d1d64 d8b0f782f3
commit 0a3e150e52
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/VibratorService.java
View File

@@ -116,6 +116,7 @@ public class VibratorService extends IVibratorService.Stub
private final LinkedList<VibrationInfo> mPreviousRingVibrations; private final LinkedList<VibrationInfo> mPreviousRingVibrations;
private final LinkedList<VibrationInfo> mPreviousNotificationVibrations; private final LinkedList<VibrationInfo> mPreviousNotificationVibrations;
private final LinkedList<VibrationInfo> mPreviousAlarmVibrations; private final LinkedList<VibrationInfo> mPreviousAlarmVibrations;
private final LinkedList<ExternalVibration> mPreviousExternalVibrations;
private final LinkedList<VibrationInfo> mPreviousVibrations; private final LinkedList<VibrationInfo> mPreviousVibrations;
private final int mPreviousVibrationsLimit; private final int mPreviousVibrationsLimit;
private final boolean mAllowPriorityVibrationsInLowPowerMode; private final boolean mAllowPriorityVibrationsInLowPowerMode;
@@ -368,6 +369,7 @@ public class VibratorService extends IVibratorService.Stub
mPreviousNotificationVibrations = new LinkedList<>(); mPreviousNotificationVibrations = new LinkedList<>();
mPreviousAlarmVibrations = new LinkedList<>(); mPreviousAlarmVibrations = new LinkedList<>();
mPreviousVibrations = new LinkedList<>(); mPreviousVibrations = new LinkedList<>();
mPreviousExternalVibrations = new LinkedList<>();
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_SCREEN_OFF);
@@ -1418,6 +1420,12 @@ public class VibratorService extends IVibratorService.Stub
pw.print(" "); pw.print(" ");
pw.println(info.toString()); pw.println(info.toString());
} }
pw.println(" Previous external vibrations:");
for (ExternalVibration vib : mPreviousExternalVibrations) {
pw.print(" ");
pw.println(vib.toString());
}
} }
} }
@@ -1462,6 +1470,10 @@ public class VibratorService extends IVibratorService.Stub
// Note that this doesn't support multiple concurrent external controls, as we // Note that this doesn't support multiple concurrent external controls, as we
// would need to mute the old one still if it came from a different controller. // would need to mute the old one still if it came from a different controller.
mCurrentExternalVibration = vib; mCurrentExternalVibration = vib;
if (mPreviousExternalVibrations.size() > mPreviousVibrationsLimit) {
mPreviousExternalVibrations.removeFirst();
}
mPreviousExternalVibrations.addLast(vib);
if (DEBUG) { if (DEBUG) {
Slog.e(TAG, "Playing external vibration: " + vib); Slog.e(TAG, "Playing external vibration: " + vib);
} }