Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Device config flag clean up in Vibrator."

Browse Source
This commit is contained in:
Yiwen Chen
2020-02-12 22:07:41 +00:00
committed by Android (Google) Code Review
parent 1c58541605 1f2e825343
commit 5d6911fbd2
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/VibratorService.java
View File

@@ -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;