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

Commit 5d6911fb authored by Yiwen Chen's avatar Yiwen Chen Committed by Android (Google) Code Review
Browse files

Merge "Device config flag clean up in Vibrator."

parents 1c585416 1f2e8253

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

+1 −5
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import android.os.VibrationAttributes; 
import android.os.VibrationEffect;

import android.os.Vibrator;

import android.os.WorkSource;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.util.DebugUtils;
@@ -88,7 +87,6 @@ public class VibratorService extends IVibratorService.Stub 
    private static final String TAG = "VibratorService";

    private static final boolean DEBUG = false;

    private static final String EXTERNAL_VIBRATOR_SERVICE = "external_vibrator_service";

    private static final String RAMPING_RINGER_ENABLED = "ramping_ringer_enabled";



    private static final long[] DOUBLE_CLICK_EFFECT_FALLBACK_TIMINGS = { 0, 30, 100, 30 };
@@ -1052,9 +1050,7 @@ public class VibratorService extends IVibratorService.Stub 
                mContext.getContentResolver(), Settings.System.VIBRATE_WHEN_RINGING, 0) != 0) {

            return ringerMode != AudioManager.RINGER_MODE_SILENT;

        } else if (Settings.Global.getInt(

                    mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0) != 0

                && DeviceConfig.getBoolean(

                    DeviceConfig.NAMESPACE_TELEPHONY, RAMPING_RINGER_ENABLED, false)) {

                    mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0) != 0) {

            return ringerMode != AudioManager.RINGER_MODE_SILENT;

        } else {

            return ringerMode == AudioManager.RINGER_MODE_VIBRATE;