Track multi-user change.
Change-Id: I0b45ec880f6149fba5d2d83c014e1e71a6524b99
diff --git a/apps/Development/src/com/android/development/InstrumentationList.java b/apps/Development/src/com/android/development/InstrumentationList.java
index 88f09f8..eb6c251 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.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 @@
}
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 9ba3191..ec3160c 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 @@
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;