drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix test build failure"

Browse Source
This commit is contained in:
Amith Yamasani
2013-01-17 00:10:16 +00:00
committed by Android (Google) Code Review
parent a7110fd19a 45c0924fbb
commit 5ebefec5bd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
View File

@ -237,7 +237,7 @@ public class ActivityTestMain extends Activity {
Log.i(TAG, "Service disconnected " + name);
}
};
if (bindService(intent, conn, Context.BIND_AUTO_CREATE, 0)) {
if (bindServiceAsUser(intent, conn, Context.BIND_AUTO_CREATE, UserHandle.OWNER)) {
mConnections.add(conn);
} else {
Toast.makeText(ActivityTestMain.this, "Failed to bind",
@ -260,7 +260,8 @@ public class ActivityTestMain extends Activity {
Log.i(TAG, "Service disconnected " + name);
}
};
if (bindService(intent, conn, Context.BIND_AUTO_CREATE, mSecondUser)) {
if (bindServiceAsUser(intent, conn, Context.BIND_AUTO_CREATE,
new UserHandle(mSecondUser))) {
mConnections.add(conn);
} else {
Toast.makeText(ActivityTestMain.this, "Failed to bind",