Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev

src/com/android/settings/accessibility/RingVibrationPreferenceConfig.java

@@ -41,21 +41,6 @@ public class RingVibrationPreferenceConfig extends VibrationPreferenceConfig {
         return true;
     }
 
-    @Override
-    public int readIntensity() {
-        final int vibrateWhenRinging = Settings.System.getInt(mContentResolver,
-                Settings.System.VIBRATE_WHEN_RINGING, ON);
-
-        if ((vibrateWhenRinging == OFF)
-                && !mAudioManager.isRampingRingerEnabled()) {
-            // VIBRATE_WHEN_RINGING is deprecated but should still be applied if the user has
-            // turned it off and has not enabled the ramping ringer (old three-state setting).
-            return Vibrator.VIBRATION_INTENSITY_OFF;
-        }
-
-        return super.readIntensity();
-    }
-
     @Override
     public boolean updateIntensity(int intensity) {
         final boolean success = super.updateIntensity(intensity);