diff options
| author | Todd Kjos <tkjos@google.com> | 2015-05-28 17:39:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 17:39:31 +0000 |
| commit | c5301a822dc9747ac3bb75bbdc18edd096f576f8 (patch) | |
| tree | 2adc2696383dd5635c56eaa6fd2a3bbc7adf117f /tests/workloads | |
| parent | c523fc00896706a077d1d0a6fed50b4bfbec3bd2 (diff) | |
| parent | cd2f09c9b8cdcdd01963700ef39825e2a5f70f66 (diff) | |
| download | extras-c5301a822dc9747ac3bb75bbdc18edd096f576f8.tar.gz | |
am cd2f09c9: am 4d31f7f2: Fix hang when starting chrome
* commit 'cd2f09c9b8cdcdd01963700ef39825e2a5f70f66':
Fix hang when starting chrome
Diffstat (limited to 'tests/workloads')
| -rwxr-xr-x | tests/workloads/defs.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/workloads/defs.sh b/tests/workloads/defs.sh index 838d04f4..ba820fd6 100755 --- a/tests/workloads/defs.sh +++ b/tests/workloads/defs.sh @@ -11,8 +11,7 @@ generateActivities=0 # default activities. Can dynamically generate with -g. gmailActivity='com.google.android.gm/com.google.android.gm.ConversationListActivityGmail' hangoutsActivity='com.google.android.talk/com.google.android.talk.SigningInActivity' -chromeActivity='com.android.chrome/com.google.android.apps.chrome.ChromeTabbedActivity' -chromeLActivity='com.android.chrome/com.google.android.apps.chrome.document.DocumentActivity' +chromeActivity='com.android.chrome/com.google.android.apps.chrome.document.DocumentActivity' youtubeActivity='com.google.android.youtube/com.google.android.apps.youtube.app.WatchWhileActivity' cameraActivity='com.google.android.GoogleCamera/com.android.camera.CameraActivity' playActivity='com.android.vending/com.google.android.finsky.activities.MainActivity' @@ -332,7 +331,7 @@ function startActivity { doKeyevent HOME echo 0 return 0 - elif [ "$1" = chromeL ]; then + elif [ "$1" = chrome ]; then vout $AM_START -p "$(getPackageName $1)" http://www.theverge.com set -- $($AM_START -p "$(getPackageName $1)" http://www.theverge.com | grep ThisTime) else @@ -343,10 +342,9 @@ function startActivity { } function forceStartActivity { - if [ "$1" = chromeL ]; then - # force start doesn't work for chrome (hangs on startup) - startActivity $* - return 0 + if [ "$1" = chrome ]; then + vout $AM_START -p "$(getPackageName $1)" http://www.theverge.com + set -- $($AM_FORCE_START -p "$(getPackageName $1)" http://www.theverge.com | grep ThisTime) else vout $AM_FORCE_START "$(getActivityName $1)" set -- $($AM_FORCE_START "$(getActivityName $1)" | grep ThisTime) |