From 79613777df81d6632f7f9ac023654a183c91b681 Mon Sep 17 00:00:00 2001
From: Tyler Freeman <fuego@google.com>
Date: Thu, 4 May 2017 17:23:35 -0700
Subject: [PATCH] DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in
 low-power mode for accessibility.

This is mainly for Wear devices that don't have speakers.

Bug: 37543478
Bug: 37257715

Merged-In: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
Change-Id: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
---
 core/res/res/values/config.xml                |  4 ++++
 core/res/res/values/symbols.xml               |  1 +
 .../com/android/server/VibratorService.java   | 24 +++++++++++++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index ef149ac090b75..42e80e3aeb421 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2520,6 +2520,10 @@
     <!-- How long history of previous vibrations should be kept for the dumpsys. -->
     <integer name="config_previousVibrationsDumpLimit">20</integer>
 
+    <!-- If the device should still vibrate even in low power mode, for certain priority vibrations
+     (e.g. accessibility, alarms). This is mainly for Wear devices that don't have speakers. -->
+    <bool name="config_allowPriorityVibrationsInLowPowerMode">false</bool>
+
     <!-- Number of retries Cell Data should attempt for a given error code before
          restarting the modem.
          Error codes not listed will not lead to modem restarts.
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 56e109ce7c0b8..c193a1dda7b0c 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1735,6 +1735,7 @@
   <java-symbol type="fraction" name="config_dimBehindFadeDuration" />
   <java-symbol type="dimen" name="default_minimal_size_resizable_task" />
   <java-symbol type="fraction" name="config_screenAutoBrightnessDozeScaleFactor" />
+  <java-symbol type="bool" name="config_allowPriorityVibrationsInLowPowerMode" />
   <java-symbol type="fraction" name="config_autoBrightnessAdjustmentMaxGamma" />
   <java-symbol type="fraction" name="config_autoBrightnessDarkHorizonThresholdFactor" />
   <java-symbol type="integer" name="config_autoBrightnessAmbientLightHorizon"/>
diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java
index ab036c7163d32..58ccac4f74efd 100644
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -86,6 +86,7 @@ public class VibratorService extends IVibratorService.Stub
 
     private int mCurVibUid = -1;
     private boolean mLowPowerMode;
+    private boolean mAllowPriorityVibrationsInLowPowerMode;
     private SettingsObserver mSettingObserver;
 
     native static boolean vibratorExists();
@@ -215,6 +216,9 @@ public class VibratorService extends IVibratorService.Stub
         mPreviousVibrationsLimit = mContext.getResources().getInteger(
                 com.android.internal.R.integer.config_previousVibrationsDumpLimit);
 
+        mAllowPriorityVibrationsInLowPowerMode = mContext.getResources().getBoolean(
+                        com.android.internal.R.bool.config_allowPriorityVibrationsInLowPowerMode);
+
         mVibrations = new LinkedList<>();
         mPreviousVibrations = new LinkedList<>();
 
@@ -447,8 +451,7 @@ public class VibratorService extends IVibratorService.Stub
     // Lock held on mVibrations
     private void startVibrationLocked(final Vibration vib) {
         try {
-            if (mLowPowerMode
-                    && vib.mUsageHint != AudioAttributes.USAGE_NOTIFICATION_RINGTONE) {
+            if (!isAllowedToVibrate(vib)) {
                 return;
             }
 
@@ -485,6 +488,23 @@ public class VibratorService extends IVibratorService.Stub
         }
     }
 
+    private boolean isAllowedToVibrate(Vibration vib) {
+        if (mLowPowerMode) {
+            if (vib.mUsageHint == AudioAttributes.USAGE_NOTIFICATION_RINGTONE) {
+                return true;
+            } else if (mAllowPriorityVibrationsInLowPowerMode) {
+                if (vib.mUsageHint == AudioAttributes.USAGE_ALARM ||
+                        vib.mUsageHint == AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY ||
+                        vib.mUsageHint == AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return true;
+        }
+    }
+
     private boolean shouldVibrateForRingtone() {
         AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
         int ringerMode = audioManager.getRingerModeInternal();