Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched to another method for launching apps.

Browse Source 
Started using a separate thread which calls startActivityAndWait
for starting apps. Also increased the minimum and maximum lengths
of time to wait for apps to stabilize.

Change-Id: I49935a0ed1d1c230e58dc1629e5e4da6b3887903
This commit is contained in:
Maxim Siniavine
2012-11-20 11:29:26 -08:00
parent 89ac38bf70
commit d85b8d57a0
2 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/MemoryUsage/Android.mk
View File

@@ -8,7 +8,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := MemoryUsage
LOCAL_SDK_VERSION := 7
LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner
include $(BUILD_PACKAGE)

53
tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java
View File

@@ -18,14 +18,17 @@ package com.android.tests.memoryusage;
import android.app.ActivityManager;
import android.app.ActivityManager.ProcessErrorStateInfo;
import android.app.ActivityManager.RunningAppProcessInfo;
import android.app.ActivityManagerNative;
import android.app.IActivityManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.os.Debug.MemoryInfo;
import android.os.RemoteException;
import android.os.UserHandle;
import android.test.InstrumentationTestCase;
import android.util.Log;
@@ -48,8 +51,9 @@ public class MemoryUsageTest extends InstrumentationTestCase {
private static final int SLEEP_TIME = 1000;
private static final int THRESHOLD = 1024;
private static final int MAX_ITERATIONS = 10;
private static final int MIN_ITERATIONS = 4;
private static final int MAX_ITERATIONS = 20;
private static final int MIN_ITERATIONS = 6;
private static final int JOIN_TIMEOUT = 10000;
private static final String TAG = "MemoryUsageInstrumentation";
private static final String KEY_APPS = "apps";
@@ -58,10 +62,13 @@ public class MemoryUsageTest extends InstrumentationTestCase {
private Map<String, String> mNameToProcess;
private Map<String, String> mNameToResultKey;
private IActivityManager mAm;
public void testMemory() {
MemoryUsageInstrumentation instrumentation =
(MemoryUsageInstrumentation) getInstrumentation();
(MemoryUsageInstrumentation) getInstrumentation();
Bundle args = instrumentation.getBundle();
mAm = ActivityManagerNative.getDefault();
createMappings();
parseArgs(args);
@@ -136,7 +143,16 @@ public class MemoryUsageTest extends InstrumentationTestCase {
String process = mNameToProcess.get(appName);
Intent startIntent = mNameToIntent.get(appName);
getInstrumentation().getContext().startActivity(startIntent);
AppLaunchRunnable runnable = new AppLaunchRunnable(startIntent);
Thread t = new Thread(runnable);
t.start();
try {
t.join(JOIN_TIMEOUT);
} catch (InterruptedException e) {
// ignore
}
return process;
}
@@ -234,7 +250,7 @@ public class MemoryUsageTest extends InstrumentationTestCase {
}
int[] pids = {
proc.pid };
proc.pid };
MemoryInfo meminfo = am.getProcessMemoryInfo(pids)[0];
return meminfo.getTotalPss();
@@ -242,4 +258,29 @@ public class MemoryUsageTest extends InstrumentationTestCase {
}
return -1;
}
private class AppLaunchRunnable implements Runnable {
private Intent mLaunchIntent;
public AppLaunchRunnable(Intent intent) {
mLaunchIntent = intent;
}
public void run() {
try {
String mimeType = mLaunchIntent.getType();
if (mimeType == null && mLaunchIntent.getData() != null
&& "content".equals(mLaunchIntent.getData().getScheme())) {
mimeType = mAm.getProviderMimeType(mLaunchIntent.getData(),
UserHandle.USER_CURRENT);
}
mAm.startActivityAndWait(null, mLaunchIntent, mimeType,
null, null, 0, mLaunchIntent.getFlags(), null, null, null,
UserHandle.USER_CURRENT_OR_SELF);
} catch (RemoteException e) {
Log.w(TAG, "Error launching app", e);
}
}
}
}