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

Merge "DO NOT MERGE - Don't 'cmd vibrate' when on DND mode." into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-24 20:08:31 +00:00
committed by Android (Google) Code Review
parent cf3b6afe01 f3f14735e3
commit 9874ab69e5
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ import android.os.VibrationEffect;
import android.os.WorkSource; import android.os.WorkSource;
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.Slog; import android.util.Slog;
import android.view.InputDevice; import android.view.InputDevice;
import android.media.AudioAttributes; import android.media.AudioAttributes;
@@ -60,10 +61,7 @@ import com.android.server.power.BatterySaverPolicy.ServiceType;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.ListIterator;
public class VibratorService extends IVibratorService.Stub public class VibratorService extends IVibratorService.Stub
implements InputManager.InputDeviceListener { implements InputManager.InputDeviceListener {
@@ -948,6 +946,21 @@ public class VibratorService extends IVibratorService.Stub
} }
private int runVibrate() { private int runVibrate() {
try {
final int zenMode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ZEN_MODE);
if (zenMode != Settings.Global.ZEN_MODE_OFF) {
try (PrintWriter pw = getOutPrintWriter();) {
pw.print("Ignoring because device is on DND mode ");
pw.println(DebugUtils.flagsToString(Settings.Global.class, "ZEN_MODE_",
zenMode));
return 0;
}
}
} catch (SettingNotFoundException e) {
// ignore
}
final long duration = Long.parseLong(getNextArgRequired()); final long duration = Long.parseLong(getNextArgRequired());
if (duration > MAX_VIBRATION_MS) { if (duration > MAX_VIBRATION_MS) {
throw new IllegalArgumentException("maximum duration is " + MAX_VIBRATION_MS); throw new IllegalArgumentException("maximum duration is " + MAX_VIBRATION_MS);
@@ -972,7 +985,8 @@ public class VibratorService extends IVibratorService.Stub
pw.println(" Prints this help text."); pw.println(" Prints this help text.");
pw.println(""); pw.println("");
pw.println(" vibrate duration [description]"); pw.println(" vibrate duration [description]");
pw.println(" Vibrates for duration milliseconds."); pw.println(" Vibrates for duration milliseconds; ignored when device is on DND ");
pw.println(" (Do Not Disturb) mode.");
pw.println(""); pw.println("");
} }
} }