Merge "Fix test build failure" (5ebefec5) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -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",