am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."

* commit 'd9fb901dc65e6780db5aad1c3bdb53a93dfd371b':
  Track changes to IActivityManager.startInstrumentation.

2 files changed, 2 insertions, 2 deletions

diff --git a/apps/Development/src/com/android/development/InstrumentationList.java b/apps/Development/src/com/android/development/InstrumentationList.java
index fddfe86e8..654077e11 100644
--- a/apps/Development/src/com/android/development/InstrumentationList.java
+++ b/apps/Development/src/com/android/development/InstrumentationList.java
@@ -156,7 +156,7 @@ public class InstrumentationList extends ListActivity
             try {
                 ActivityManagerNative.getDefault().
                     startInstrumentation(className, profilingFile, 0, null, mWatcher, null,
-                            UserHandle.myUserId());
+                            UserHandle.myUserId(), null);
             } catch (RemoteException ex) {
             }
         }
diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeyInstrumentationEvent.java b/cmds/monkey/src/com/android/commands/monkey/MonkeyInstrumentationEvent.java
index b2ae2471d..a4f276dc4 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeyInstrumentationEvent.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeyInstrumentationEvent.java
@@ -45,7 +45,7 @@ public class MonkeyInstrumentationEvent extends MonkeyEvent {
         Bundle args = new Bundle();
         args.putString("class", mTestCaseName);
         try {
-            iam.startInstrumentation(cn, null, 0, args, null, null, 0);
+            iam.startInstrumentation(cn, null, 0, args, null, null, 0, null);
         } catch (RemoteException e) {
             System.err.println("** Failed talking with activity manager!");
             return MonkeyEvent.INJECT_ERROR_REMOTE_EXCEPTION;