Merge "Fix lock ordering bug due to use of reentrant lock." (c22ee664) · Commits · e / os / android_frameworks_base

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

+21 −27

Original line number	Diff line number	Diff line
		@@ -144,10 +144,10 @@ public class VibratorService extends IVibratorService.Stub
		new ContentObserver(mH) {
		@Override
		public void onChange(boolean selfChange) {
		updateVibrateInputDevicesSetting();
		updateInputDeviceVibrators();
		}
		});
		updateVibrateInputDevicesSetting();
		updateInputDeviceVibrators();
		}

		public boolean hasVibrator() {
		@@ -334,7 +334,10 @@ public class VibratorService extends IVibratorService.Stub
		}
		}

		private void updateVibrateInputDevicesSetting() {
		private void updateInputDeviceVibrators() {
		synchronized (mVibrations) {
		doCancelVibrateLocked();

		synchronized (mInputDeviceVibrators) {
		mVibrateInputDevicesSetting = false;
		try {
		@@ -355,15 +358,6 @@ public class VibratorService extends IVibratorService.Stub
		}
		}

		updateInputDeviceVibrators();
		}
		}

		private void updateInputDeviceVibrators() {
		synchronized (mVibrations) {
		doCancelVibrateLocked();

		synchronized (mInputDeviceVibrators) {
		mInputDeviceVibrators.clear();
		if (mVibrateInputDevicesSetting) {
		int[] ids = mIm.getInputDeviceIds();