Merge "Actually report resonant frequency and Q factor for vibrators." into sc-dev

core/java/android/os/SystemVibratorManager.java

@@ -199,6 +199,16 @@ public class SystemVibratorManager extends VibratorManager {
             return mVibratorInfo.hasAmplitudeControl();
         }
 
+        @Override
+        public float getResonantFrequency() {
+            return mVibratorInfo.getResonantFrequency();
+        }
+
+        @Override
+        public float getQFactor() {
+            return mVibratorInfo.getQFactor();
+        }
+
         @NonNull
         @Override
         public int[] areEffectsSupported(@NonNull int... effectIds) {