private ContentProviderClient mClient;
private RootInfo mRoot_0;
private RootInfo mRoot_1;
+ private FilesActivity mActivity;
public void setUp() throws Exception {
// Initialize UiDevice instance.
// Launch app.
Intent intent = mContext.getPackageManager().getLaunchIntentForPackage(TARGET_PKG);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
- mContext.startActivity(intent);
+ mActivity = launchActivityWithIntent(TARGET_PKG, FilesActivity.class, intent);
+ assertNotNull("Activity not started.", mActivity);
// Wait for the app to appear.
mDevice.wait(Until.hasObject(By.pkg(TARGET_PKG).depth(0)), TIMEOUT);
@Override
protected void tearDown() throws Exception {
super.tearDown();
+
+ if (mActivity != null) {
+ mActivity.finish();
+ mActivity = null;
+ }
+
Log.d(TAG, "Resetting storage from setUp");
resetStorage();
mClient.release();