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

Commit 1f2e8253 authored by Yiwen Chen's avatar Yiwen Chen
Browse files

Device config flag clean up in Vibrator. 

Test: built and tested on device
Change-Id: Ic917a404473d51fce1c6151622e07b789fd7e7fb
parent 394b62bc

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

+1 −5
Original line number Diff line number Diff line
@@ -59,7 +59,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;
@@ -86,7 +85,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 };
@@ -977,9 +975,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;