am 6852ac74: am 077c59a0: Track multi-user change.

* commit '6852ac7430cdf909a223e6ba9d9ec9b9ca22e46a':
  Track multi-user change.

2 files changed, 3 insertions, 2 deletions

diff --git a/apps/Development/src/com/android/development/InstrumentationList.java b/apps/Development/src/com/android/development/InstrumentationList.java
index 88f09f867..eb6c2519b 100644
--- a/apps/Development/src/com/android/development/InstrumentationList.java
+++ b/apps/Development/src/com/android/development/InstrumentationList.java
@@ -25,6 +25,7 @@ import android.content.pm.InstrumentationInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -154,7 +155,7 @@ public class InstrumentationList extends ListActivity
             }
             try {
                 ActivityManagerNative.getDefault().
-                    startInstrumentation(className, profilingFile, 0, null, mWatcher);
+                    startInstrumentation(className, profilingFile, 0, null, mWatcher, UserHandle.myUserId());
             } 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 9ba31912b..ec3160cb3 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeyInstrumentationEvent.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeyInstrumentationEvent.java
@@ -46,7 +46,7 @@ public class MonkeyInstrumentationEvent extends MonkeyEvent {
         Bundle args = new Bundle();
         args.putString("class", mTestCaseName);
         try {
-            iam.startInstrumentation(cn, null, 0, args, null);
+            iam.startInstrumentation(cn, null, 0, args, null, 0);
         } catch (RemoteException e) {
             System.err.println("** Failed talking with activity manager!");
             return MonkeyEvent.INJECT_ERROR_REMOTE_EXCEPTION;