From: Todd Kjos <tkjos@google.com>
Date: Tue, 9 Jun 2015 00:48:08 +0000 (-0700)
Subject: fix chrome activity name in systemapps.sh
X-Git-Tag: android-x86-6.0-r1~23
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fsystem-extras.git;a=commitdiff_plain;h=d0fefb8421a9cb57ac27d0d4fcf3abe938fcf2d1

fix chrome activity name in systemapps.sh

the activity name for chrome changed recently which broke
systemapps.sh for some devices/builds. This change removes
the dependance on the chrome activity name in  systemapps.sh

Change-Id: I7f194a5c60221650300b6ab0df526f5bdf4b7f79
---

diff --git a/tests/workloads/defs.sh b/tests/workloads/defs.sh
index dbed4dd7..a2b71387 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.document.DocumentActivity'
-chromeActivityVolantis='com.android.chrome/com.google.android.apps.chrome.ChromeTabbedActivity'
+chromeActivity='com.android.chrome/_not_used'
 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'
@@ -96,9 +95,6 @@ else
 	ADB="adb -s $deviceName shell "
 	DEVICE=$(echo $4 | sed 's/product://')
 	isOnDevice=0
-	if [ "$DEVICE" = volantis ]; then
-		chromeActivity=$chromeActivityVolantis
-	fi
 fi
 
 # default values if not set by options or calling script
diff --git a/tests/workloads/systemapps.sh b/tests/workloads/systemapps.sh
index 0978dbd9..a263e7d2 100755
--- a/tests/workloads/systemapps.sh
+++ b/tests/workloads/systemapps.sh
@@ -210,9 +210,10 @@ do
 		else
 			stopAndDumpInstramentation $tmpTraceOut
 			actName=$(getActivityName $app)
+			pkgName=$(getPackageName $app)
 			stime=$(getStartTime $actName $tmpTraceOut)
 			relaunch=$?
-			etime=$(getEndTime $actName $tmpTraceOut)
+			etime=$(getEndTime $pkgName $tmpTraceOut)
 			((tdiff=$etime-$stime))
 			if [ $etime -eq 0 -o $stime -eq 0 ]; then
 				handleError $app : could not compute start time stime=$stime  etime=$etime