Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3bb0810 authored by Alexey Kuzmin's avatar Alexey Kuzmin Committed by android-build-merger
Browse files

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

am: 0a3e150e

Change-Id: I51fb50a7f8c73e8f44941fe02fe67656bf4d27e8
parents 00b5f0b4 0a3e150e

services/core/java/com/android/server/VibratorService.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -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);

                    }

                    }