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

Commit b0a1cb54 authored by Lais Andrade's avatar Lais Andrade Committed by Automerger Merge Worker
Browse files

Merge "vibrator: fix log format and level issue" am: b189ace6 am: c61ab518 am: 1c4af6cc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2370170



Change-Id: I0d94cd1db9fb6b6c5af2f09c066ca99f5f002bb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df380260 1c4af6cc

services/core/java/com/android/server/vibrator/VibratorManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1749,7 +1749,7 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { 
                setExternalControl(true, vibHolder.stats);

            }

            if (DEBUG) {

                Slog.e(TAG, "Playing external vibration: " + vib);

                Slog.d(TAG, "Playing external vibration: " + vib);

            }

            // Vibrator will start receiving data from external channels after this point.

            // Report current time as the vibration start time, for debugging.
@@ -1763,7 +1763,7 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { 
                if (mCurrentExternalVibration != null

                        && mCurrentExternalVibration.isHoldingSameVibration(vib)) {

                    if (DEBUG) {

                        Slog.e(TAG, "Stopping external vibration" + vib);

                        Slog.d(TAG, "Stopping external vibration: " + vib);

                    }

                    endExternalVibrateLocked(

                            new Vibration.EndInfo(Vibration.Status.FINISHED),