Merge "Fix lock ordering bug due to use of reentrant lock."

Author: Jeff Brown

services/java/com/android/server/VibratorService.java

@@ -144,10 +144,10 @@ public void systemReady() {
                 new ContentObserver(mH) {
                     @Override
                     public void onChange(boolean selfChange) {
-                        updateVibrateInputDevicesSetting();
+                        updateInputDeviceVibrators();
                     }
                 });
-        updateVibrateInputDevicesSetting();
+        updateInputDeviceVibrators();
     }
 
     public boolean hasVibrator() {
@@ -334,36 +334,30 @@ private void unlinkVibration(Vibration vib) {
         }
     }
 
-    private void updateVibrateInputDevicesSetting() {
-        synchronized (mInputDeviceVibrators) {
-            mVibrateInputDevicesSetting = false;
-            try {
-                mVibrateInputDevicesSetting = Settings.System.getInt(mContext.getContentResolver(),
-                        Settings.System.VIBRATE_INPUT_DEVICES) > 0;
-            } catch (SettingNotFoundException snfe) {
-            }
-
-            if (mVibrateInputDevicesSetting) {
-                if (!mInputDeviceListenerRegistered) {
-                    mInputDeviceListenerRegistered = true;
-                    mIm.registerInputDeviceListener(this, mH);
-                }
-            } else {
-                if (mInputDeviceListenerRegistered) {
-                    mInputDeviceListenerRegistered = false;
-                    mIm.unregisterInputDeviceListener(this);
-                }
-            }
-
-            updateInputDeviceVibrators();
-        }
-    }
-
     private void updateInputDeviceVibrators() {
         synchronized (mVibrations) {
             doCancelVibrateLocked();
 
             synchronized (mInputDeviceVibrators) {
+                mVibrateInputDevicesSetting = false;
+                try {
+                    mVibrateInputDevicesSetting = Settings.System.getInt(mContext.getContentResolver(),
+                            Settings.System.VIBRATE_INPUT_DEVICES) > 0;
+                } catch (SettingNotFoundException snfe) {
+                }
+
+                if (mVibrateInputDevicesSetting) {
+                    if (!mInputDeviceListenerRegistered) {
+                        mInputDeviceListenerRegistered = true;
+                        mIm.registerInputDeviceListener(this, mH);
+                    }
+                } else {
+                    if (mInputDeviceListenerRegistered) {
+                        mInputDeviceListenerRegistered = false;
+                        mIm.unregisterInputDeviceListener(this);
+                    }
+                }
+
                 mInputDeviceVibrators.clear();
                 if (mVibrateInputDevicesSetting) {
                     int[] ids = mIm.getInputDeviceIds();