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

Merge "Check if ramping ringer is enabled for vibrator service." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-28 18:17:18 +00:00
committed by Android (Google) Code Review
parent b1ae9acbc4 f8e46d725a
commit 40df1f89a3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ import android.os.UserHandle;
import android.os.VibrationEffect; import android.os.VibrationEffect;
import android.os.Vibrator; import android.os.Vibrator;
import android.os.WorkSource; import android.os.WorkSource;
import android.provider.DeviceConfig;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException; import android.provider.Settings.SettingNotFoundException;
import android.util.DebugUtils; import android.util.DebugUtils;
@@ -78,6 +79,7 @@ public class VibratorService extends IVibratorService.Stub
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private static final String SYSTEM_UI_PACKAGE = "com.android.systemui"; private static final String SYSTEM_UI_PACKAGE = "com.android.systemui";
private static final String EXTERNAL_VIBRATOR_SERVICE = "external_vibrator_service"; 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 }; private static final long[] DOUBLE_CLICK_EFFECT_FALLBACK_TIMINGS = { 0, 30, 100, 30 };
@@ -874,6 +876,11 @@ public class VibratorService extends IVibratorService.Stub
if (Settings.System.getInt( if (Settings.System.getInt(
mContext.getContentResolver(), Settings.System.VIBRATE_WHEN_RINGING, 0) != 0) { mContext.getContentResolver(), Settings.System.VIBRATE_WHEN_RINGING, 0) != 0) {
return ringerMode != AudioManager.RINGER_MODE_SILENT; 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)) {
return ringerMode != AudioManager.RINGER_MODE_SILENT;
} else { } else {
return ringerMode == AudioManager.RINGER_MODE_VIBRATE; return ringerMode == AudioManager.RINGER_MODE_VIBRATE;
} }