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

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

Merge "Implement dump and vibrate cmds for Vibrator Manager" into sc-dev am: 27225f68 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I506451cba5e9a733674dd72c80ab828e7722a8bb
parents e2c04428 27225f68

core/java/android/os/VibrationAttributes.java

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ public final class VibrationAttributes implements Parcelable { 
    }



    /** @hide */

    public String usageToString(int usage) {

    public static String usageToString(int usage) {

        switch (usage) {

            case USAGE_UNKNOWN:

                return "UNKNOWN";

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

+400 −5

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −12
Original line number Diff line number Diff line
@@ -772,18 +772,7 @@ public class VibratorService extends IVibratorService.Stub { 
            proto.write(VibratorServiceDumpProto.IS_VIBRATING, mVibratorController.isVibrating());

            proto.write(VibratorServiceDumpProto.VIBRATOR_UNDER_EXTERNAL_CONTROL,

                    mVibratorController.isUnderExternalControl());

            proto.write(VibratorServiceDumpProto.HAPTIC_FEEDBACK_INTENSITY,

                    mVibrationSettings.getCurrentIntensity(VibrationAttributes.USAGE_TOUCH));

            proto.write(VibratorServiceDumpProto.HAPTIC_FEEDBACK_DEFAULT_INTENSITY,

                    mVibrationSettings.getDefaultIntensity(VibrationAttributes.USAGE_TOUCH));

            proto.write(VibratorServiceDumpProto.NOTIFICATION_INTENSITY,

                    mVibrationSettings.getCurrentIntensity(VibrationAttributes.USAGE_NOTIFICATION));

            proto.write(VibratorServiceDumpProto.NOTIFICATION_DEFAULT_INTENSITY,

                    mVibrationSettings.getDefaultIntensity(VibrationAttributes.USAGE_NOTIFICATION));

            proto.write(VibratorServiceDumpProto.RING_INTENSITY,

                    mVibrationSettings.getCurrentIntensity(VibrationAttributes.USAGE_RINGTONE));

            proto.write(VibratorServiceDumpProto.RING_DEFAULT_INTENSITY,

                    mVibrationSettings.getDefaultIntensity(VibrationAttributes.USAGE_RINGTONE));

            mVibrationSettings.dumpProto(proto);



            for (Vibration.DebugInfo info : mPreviousRingVibrations) {

                info.dumpProto(proto, VibratorServiceDumpProto.PREVIOUS_RING_VIBRATIONS);

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

+20 −0
Original line number Diff line number Diff line
@@ -34,10 +34,12 @@ import android.os.VibrationEffect; 
import android.os.Vibrator;

import android.provider.Settings;

import android.util.SparseArray;

import android.util.proto.ProtoOutputStream;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.server.LocalServices;

import com.android.server.VibratorServiceDumpProto;



import java.util.ArrayList;

import java.util.List;
@@ -340,6 +342,24 @@ public final class VibrationSettings { 
                + '}';

    }



    /** Write current settings into given {@link ProtoOutputStream}. */

    public void dumpProto(ProtoOutputStream proto) {

        synchronized (mLock) {

            proto.write(VibratorServiceDumpProto.HAPTIC_FEEDBACK_INTENSITY,

                    mHapticFeedbackIntensity);

            proto.write(VibratorServiceDumpProto.HAPTIC_FEEDBACK_DEFAULT_INTENSITY,

                    mVibrator.getDefaultHapticFeedbackIntensity());

            proto.write(VibratorServiceDumpProto.NOTIFICATION_INTENSITY,

                    mNotificationIntensity);

            proto.write(VibratorServiceDumpProto.NOTIFICATION_DEFAULT_INTENSITY,

                    mVibrator.getDefaultNotificationVibrationIntensity());

            proto.write(VibratorServiceDumpProto.RING_INTENSITY,

                    mRingIntensity);

            proto.write(VibratorServiceDumpProto.RING_DEFAULT_INTENSITY,

                    mVibrator.getDefaultRingVibrationIntensity());

        }

    }



    private void notifyListeners() {

        List<OnVibratorSettingsChanged> currentListeners;

        synchronized (mLock) {

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

+7 −1

File changed.

Preview size limit exceeded, changes collapsed.