Merge branch 'master' into honeycomb-release

apps/Development/src/com/android/development/SyncAdapterDriver.java

@@ -367,7 +367,12 @@ public class SyncAdapterDriver extends Activity
                         com.android.internal.R.styleable.SyncAdapter_userVisible, true);
                 final boolean supportsUploading = sa.getBoolean(
                         com.android.internal.R.styleable.SyncAdapter_supportsUploading, true);
-                return new SyncAdapterType(authority, accountType, userVisible, supportsUploading);
+                final boolean isAlwaysSyncable = sa.getBoolean(
+                        com.android.internal.R.styleable.SyncAdapter_isAlwaysSyncable, false);
+                final boolean allowParallelSyncs = sa.getBoolean(
+                        com.android.internal.R.styleable.SyncAdapter_allowParallelSyncs, false);
+                return new SyncAdapterType(authority, accountType, userVisible, supportsUploading,
+                        isAlwaysSyncable, allowParallelSyncs);
             } finally {
                 sa.recycle();
             }

cmds/monkey/monkey

@@ -3,5 +3,6 @@
 #
 base=/system
 export CLASSPATH=$base/framework/monkey.jar
+trap "" HUP
 exec app_process $base/bin com.android.commands.monkey.Monkey $*
 

cmds/monkey/src/com/android/commands/monkey/MonkeySourceScript.java

@@ -597,41 +597,19 @@ public class MonkeySourceScript implements MonkeyEventSource {
     }
 
     /**
-     * Adjust motion downtime and eventtime according to both recorded values
-     * and current system time.
+     * Adjust motion downtime and eventtime according to current system time.
      *
      * @param e A KeyEvent
      */
     private void adjustMotionEventTime(MonkeyMotionEvent e) {
+        long updatedDownTime = 0;
+
         if (e.getEventTime() < 0) {
             return;
         }      
-        long thisDownTime = 0;
-        long thisEventTime = 0;
-        long expectedDelay = 0;
-
-        if (mLastRecordedEventTime <= 0) {
-            // first time event
-            thisDownTime = SystemClock.uptimeMillis();
-            thisEventTime = thisDownTime;
-        } else {
-            if (e.getDownTime() != mLastRecordedDownTimeMotion) {
-                thisDownTime = e.getDownTime();
-            } else {
-                thisDownTime = mLastExportDownTimeMotion;
-            }
-            expectedDelay = (long) ((e.getEventTime() - mLastRecordedEventTime) * mSpeed);
-            thisEventTime = mLastExportEventTime + expectedDelay;
-            // add sleep to simulate everything in recording
-            needSleep(expectedDelay - SLEEP_COMPENSATE_DIFF);
-        }
-
-        mLastRecordedDownTimeMotion = e.getDownTime();
-        mLastRecordedEventTime = e.getEventTime();
-        e.setDownTime(thisDownTime);
-        e.setEventTime(thisEventTime);
-        mLastExportDownTimeMotion = thisDownTime;
-        mLastExportEventTime = thisEventTime;
+        updatedDownTime = SystemClock.uptimeMillis();
+        e.setDownTime(updatedDownTime);
+        e.setEventTime(updatedDownTime);
     }
 
     /**