Using SystemVibrator in the cases other than Ringer.java

In ICS, Phone app was creating separate Vibrator instances in
Ringer.java and CallNotifier.java, while in Jellybean they started
relying on one single Vibrator Service.
See also Id928ffef9a87e2563198240e91184cf59ecebbb1.

It means vibrate()/cancel() calls from two files interfere with each
other. When "Emergency tone" is set to "Vibrate" in Sound Setting
(which is only available with CDMA devices), this causes unexpected
trouble; the "Emergency tone" vibration is canceled immediately by
Ringer's Vibrator#cancel() call. onPhoneStateChanged() is indirectly
calling the method.

This change stops using the Vibrator Service in the emergency vibration
case, so that two Vibrator objects won't interfere with each other.

TESTED (use CDMA phone):
- Set "Emergency tone" to "Vibrate", and make a phone call to "911"
-> The device should vibrate for hundreds of mills (even without a
   fix, it may vibrate for an instant, so need to check how long)

Bug: 6794250
Change-Id: I69e6c3d99b14b3c50c57ff5d59ca42f4ea18024f

src/com/android/phone/CallNotifier.java

@@ -39,6 +39,7 @@
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.SystemProperties;
+import android.os.SystemVibrator;
 import android.os.Vibrator;
 import android.provider.CallLog.Calls;
 import android.provider.Settings;
@@ -1932,7 +1933,9 @@ private class EmergencyTonePlayerVibrator {
                 new long[] { EMG_VIBRATE_LENGTH, EMG_VIBRATE_PAUSE };
 
         private ToneGenerator mToneGenerator;
-        private Vibrator mEmgVibrator;
+        // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this vibrator
+        // object will be isolated from others.
+        private Vibrator mEmgVibrator = new SystemVibrator();
         private int mInCallVolume;
 
         /**
@@ -1963,7 +1966,6 @@ private void start() {
                 }
             } else if (mIsEmergencyToneOn == EMERGENCY_TONE_VIBRATE) {
                 log("EmergencyTonePlayerVibrator.start(): emergency vibrate...");
-                mEmgVibrator = (Vibrator)mApplication.getSystemService(Context.VIBRATOR_SERVICE);
                 if (mEmgVibrator != null) {
                     mEmgVibrator.vibrate(mVibratePattern, 0);
                     mCurrentEmergencyToneState = EMERGENCY_TONE_VIBRATE;

src/com/android/phone/HapticFeedback.java

@@ -16,13 +16,14 @@
 
 package com.android.phone;
 
-import android.content.Context;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.res.Resources;
+import android.os.SystemVibrator;
 import android.os.Vibrator;
-import android.util.Log;
 import android.provider.Settings;
 import android.provider.Settings.System;
+import android.util.Log;
 
 /**
  * Handles the haptic feedback: a light buzz happening when the user
@@ -89,7 +90,9 @@ public class HapticFeedback {
     public void init(Context context, boolean enabled) {
         mEnabled = enabled;
         if (enabled) {
-            mVibrator = (Vibrator)context.getSystemService(Context.VIBRATOR_SERVICE);
+            // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this
+            // vibrator object will be isolated from others.
+            mVibrator = new SystemVibrator();
             if (!loadHapticSystemPattern(context.getResources())) {
                 mHapticPattern = new long[] {0, DURATION, 2 * DURATION, 3 * DURATION};
             }

src/com/android/phone/Ringer.java

@@ -29,6 +29,7 @@
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.SystemProperties;
+import android.os.SystemVibrator;
 import android.os.Vibrator;
 import android.provider.Settings;
 import android.util.Log;
@@ -84,7 +85,9 @@ public class Ringer {
     private Ringer(Context context) {
         mContext = context;
         mPowerManager = IPowerManager.Stub.asInterface(ServiceManager.getService(Context.POWER_SERVICE));
-        mVibrator = (Vibrator)context.getSystemService(Context.VIBRATOR_SERVICE);
+        // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this
+        // vibrator object will be isolated from others.
+        mVibrator = new SystemVibrator();
     }
 
     /**