am e70a32a: am eb00f95: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern"

Jean-Baptiste Queru · Android Git Automerger · commit ba37d595f70d · 2012-08-27T08:13:27.000-07:00
* commit 'e70a32afc5b27ddc9681efd867780a0c4c77edd3':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
diff --git a/services/java/com/android/server/VibratorService.java b/services/java/com/android/server/VibratorService.java
@@ -441,7 +441,7 @@ private class VibrateThread extends Thread {
 
         private void delay(long duration) {
             if (duration > 0) {
-                long bedtime = SystemClock.uptimeMillis();
+                long bedtime = duration + SystemClock.uptimeMillis();
                 do {
                     try {
                         this.wait(duration);
@@ -451,8 +451,7 @@ private void delay(long duration) {
                     if (mDone) {
                         break;
                     }
-                    duration = duration
-                            - SystemClock.uptimeMillis() - bedtime;
+                    duration = bedtime - SystemClock.uptimeMillis();
                 } while (duration > 0);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ private class VibrateThread extends Thread {`
`441`	`441`
`442`	`442`	`private void delay(long duration) {`
`443`	`443`	`if (duration > 0) {`
`444`		`- long bedtime = SystemClock.uptimeMillis();`
	`444`	`+ long bedtime = duration + SystemClock.uptimeMillis();`
`445`	`445`	`do {`
`446`	`446`	`try {`
`447`	`447`	`this.wait(duration);`
`@@ -451,8 +451,7 @@ private void delay(long duration) {`
`451`	`451`	`if (mDone) {`
`452`	`452`	`break;`
`453`	`453`	`}`
`454`		`- duration = duration`
`455`		`- - SystemClock.uptimeMillis() - bedtime;`
	`454`	`+ duration = bedtime - SystemClock.uptimeMillis();`
`456`	`455`	`} while (duration > 0);`
`457`	`456`	`}`
`458`	`457`	`}`