Changes for mtp8996

Change-Id: I5fe5c365226087af47aaf7c5a576b7f2622f804d

diff --git a/tests/workloads/capture.sh b/tests/workloads/capture.sh
index 3b2f446..9c3eadc 100755 (executable)
--- a/tests/workloads/capture.sh
+++ b/tests/workloads/capture.sh
@@ -38,7 +38,7 @@ function convert {
 
 
 case $DEVICE in
-(shamu|hammerhead|bullhead)
+(shamu|hammerhead|bullhead|ariel)
        # no scaling necessary
        xmax=0
        ymax=0;;

diff --git a/tests/workloads/chromefling.sh b/tests/workloads/chromefling.sh
index a86f274..db6aa2e 100755 (executable)
--- a/tests/workloads/chromefling.sh
+++ b/tests/workloads/chromefling.sh
@@ -63,6 +63,12 @@ case $DEVICE in
        upCount=5
        UP="500 1400 500 400 $flingtime"
        DOWN="500 400 500 1400 $flingtime";;
+(ariel)
+       flingtime=200
+       downCount=5
+       upCount=5
+       UP="500 1560 500 530 $flingtime"
+       DOWN="500 530 500 1560 $flingtime";;
 (*)
        echo "Error: No display information available for $DEVICE"
        exit 1;;
@@ -98,19 +104,6 @@ do
        sleep $waittime
        swipe "$UP" $upCount
 
-       t=$(startActivity $app)
-       sleep $waittime
-       swipe "$UP" $upCount
-
-       t=$(startActivity $app)
-       sleep $waittime
-       swipe "$UP" $upCount
-
-       doKeyevent BACK
-       sleep $waittime
-       swipe "$DOWN" $downCount
-
-       doKeyevent BACK
        sleep $waittime
        swipe "$DOWN" $downCount
 

diff --git a/tests/workloads/defs.sh b/tests/workloads/defs.sh
index 0f50fe1..400722b 100755 (executable)
--- a/tests/workloads/defs.sh
+++ b/tests/workloads/defs.sh
@@ -10,8 +10,10 @@ generateActivities=0
 
 # default activities. Can dynamically generate with -g.
 gmailActivity='com.google.android.gm/com.google.android.gm.ConversationListActivityGmail'
+clockActivity='com.google.android.deskclock/com.android.deskclock.DeskClock'
 hangoutsActivity='com.google.android.talk/com.google.android.talk.SigningInActivity'
 chromeActivity='com.android.chrome/_not_used'
+contactsActivity='com.google.android.contacts/com.android.contacts.activities.PeopleActivity'
 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'
@@ -21,6 +23,7 @@ mapsActivity='com.google.android.apps.maps/com.google.android.maps.MapsActivity'
 calendarActivity='com.google.android.calendar/com.android.calendar.AllInOneActivity'
 earthActivity='com.google.earth/com.google.earth.EarthActivity'
 calculatorActivity='com.google.android.calculator/com.android.calculator2.Calculator'
+calculatorLActivity='com.android.calculator2/com.android.calculator2.Calculator'
 sheetsActivity='com.google.android.apps.docs.editors.sheets/com.google.android.apps.docs.app.NewMainProxyActivity'
 docsActivity='com.google.android.apps.docs.editors.docs/com.google.android.apps.docs.app.NewMainProxyActivity'
 operaActivity='com.opera.mini.native/com.opera.mini.android.Browser'
@@ -94,7 +97,9 @@ else
        fi
        deviceName=$1
        ADB="adb -s $deviceName shell "
-       DEVICE=$(echo $4 | sed 's/product://')
+       if [ "$DEVICE" = "" -o "$DEVICE" = unknown ]; then
+               DEVICE=$(echo $4 | sed 's/product://')
+       fi
        isOnDevice=0
 fi
 
@@ -360,7 +365,7 @@ function startActivity {
                echo 0
                return 0
        elif [ "$1" = chrome ]; then
-               if [ "$DEVICE" = volantis ]; then
+               if [ "$DEVICE" = volantis -o "$DEVICE" = ariel ]; then
                        vout $AM_START_NOWAIT -p "$(getPackageName $1)" http://www.theverge.com
                        $AM_START_NOWAIT -p "$(getPackageName $1)" http://www.theverge.com > /dev/null
                        set -- 0 0

diff --git a/tests/workloads/pwrtest.sh b/tests/workloads/pwrtest.sh
index ca0f78d..39f7b11 100755 (executable)
--- a/tests/workloads/pwrtest.sh
+++ b/tests/workloads/pwrtest.sh
@@ -34,6 +34,7 @@
 #   a bash script which should include adb commands to set up device):
 #     ./pwrtest.sh -F devtunables
 #
+
 defaultTime=30
 garbageminutes=8
 
@@ -232,6 +233,8 @@ function restart_device {
        echo Wait 30s to complete boot activities...
        sleep 30
        echo Restart complete.
+       doTap 897 1075
+       sleep 2
        doSwipe $onSwipe
        restartfile=${restartfile:="./restarthook"}
        if [ -f $restartfile ]; then

diff --git a/tests/workloads/recentfling.sh b/tests/workloads/recentfling.sh
index d495934..79713f3 100755 (executable)
--- a/tests/workloads/recentfling.sh
+++ b/tests/workloads/recentfling.sh
@@ -18,10 +18,12 @@ function processLocalOption {
        (-A) unset appList;;
        (-L) appList=$2; shift; ret=1;;
        (-T) capturesystrace=1;;
+       (-B) echo $$ > /dev/cpuset/background/tasks;;
        (*)
                echo "$0: unrecognized option: $1"
                echo; echo "Usage: $0 [options]"
                echo "-A : use all known applications"
+               echo "-B : run in background cpuset"
                echo "-L applist : list of applications"
                echo "   default: $appList"
                echo "-N : no app startups, just fling"
@@ -44,7 +46,7 @@ case $DEVICE in
        upCount=6
        UP="70 400 70 100 $flingtime"
        DOWN="70 100 70 400 $flingtime";;
-(angler)
+(angler|ariel|mtp8996)
        flingtime=150
        downCount=4
        upCount=3

diff --git a/tests/workloads/youtube.sh b/tests/workloads/youtube.sh
index 2d6b136..558e53c 100755 (executable)
--- a/tests/workloads/youtube.sh
+++ b/tests/workloads/youtube.sh
@@ -7,17 +7,20 @@
 iterations=10
 app=youtube
 searchText="last week tonight with john oliver: online harassment"
+vidMinutes=15
 
 function processLocalOption {
        ret=0
        case "$1" in
        (-S) searchText="$2"; shift;;
+       (-t) vidMinutes="$2"; shift;;
        (*)
                echo "$0: unrecognized option: $1"
                echo; echo "Usage: $0 [options]"
                echo "-i iterations"
                echo "-S youtube search text"
                echo "-d device"
+               echo "-t vidMinutes"
                exit 1;;
        esac
        return $ret
@@ -52,6 +55,13 @@ case $DEVICE in
        enableControls="1464 812"
        fullScreen="1480 835"
        ;;
+(ariel)
+       searchButton="1440 70"
+       selectFirstVideo="228 224"
+       enableControls="1528 880"
+       fullScreen="1528 880"
+       ;;
+
 (*)
        echo "Error: No display information available for $DEVICE"
        exit 1;;
@@ -95,7 +105,7 @@ do
        sleep 0.5
        doTap $fullScreen
        # 15 minutes
-       ((vidTime=60*15))
+       ((vidTime=60*vidMinutes))
        sleep $vidTime
        doKeyevent BACK
        sleep 0.5