summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-30 11:50:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-30 11:50:55 +0000
commit01347d965e88fcc38d75199e54b8a4a9b6ab5b5b (patch)
tree639f3f1e631568854370e26df1e10b28c37aa7b6 /apps
parent9c4a7ebc669a58116c070494525beee881877b6c (diff)
parent361fce55866e220380fdf1c81f29e5498b5fa0a7 (diff)
downloadandroid_development-01347d965e88fcc38d75199e54b8a4a9b6ab5b5b.tar.gz
android_development-01347d965e88fcc38d75199e54b8a4a9b6ab5b5b.tar.bz2
android_development-01347d965e88fcc38d75199e54b8a4a9b6ab5b5b.zip
am 361fce55: am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
* commit '361fce55866e220380fdf1c81f29e5498b5fa0a7': Track changes to IActivityManager.startInstrumentation.
Diffstat (limited to 'apps')
-rw-r--r--apps/Development/src/com/android/development/InstrumentationList.java2
1 files changed, 1 insertions, 1 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) {
}
}