LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd9fb901dc65e6780db5aad1c3bdb53a93dfd371b':
  Track changes to IActivityManager.startInstrumentation.
This commit is contained in:
Narayan Kamath
2014-05-30 10:44:18 +00:00
committed by Android Git Automerger
parent aec2c2ddc9 d9fb901dc6
commit 361fce5586
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/Development/src/com/android/development/InstrumentationList.java
View File

@@ -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) {
}
}

2
cmds/monkey/src/com/android/commands/monkey/MonkeyInstrumentationEvent.java
View File

@@ -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;