From 4f5fdd64392e82b18dba8e553a6bb31afa73189e Mon Sep 17 00:00:00 2001
From: muendelezaji <muendelezaji@gmail.com>
Date: Thu, 5 May 2016 16:48:03 +0100
Subject: [PATCH] Changes after review pull of #5

---
 wlauto/workloads/skypeecho/__init__.py        |  37 ++++---------
 .../com.arm.wlauto.uiauto.skypeecho.jar       | Bin 9928 -> 9558 bytes
 .../skypeecho/template-agenda.mustache        |   1 +
 wlauto/workloads/skypeecho/uiauto/build.sh    |   4 +-
 .../skypeecho/uiauto/project.properties       |   2 +-
 .../com/arm/wlauto/uiauto/UiAutomation.java   |  50 ++----------------
 6 files changed, 18 insertions(+), 76 deletions(-)

diff --git a/wlauto/workloads/skypeecho/__init__.py b/wlauto/workloads/skypeecho/__init__.py
index b77969f3..eb326548 100644
--- a/wlauto/workloads/skypeecho/__init__.py
+++ b/wlauto/workloads/skypeecho/__init__.py
@@ -63,8 +63,6 @@ class SkypeEcho(AndroidUiAutoBenchmark):
                   description='This is the duration of the call in seconds'),
         Parameter('action', kind=str, allowed_values=['voice', 'video'], default='video',
                   description='Action to take - either video (default) or voice call'),
-        Parameter('use_gui', kind=bool, default=True,
-                  description='Specifies whether to use GUI or direct Skype URI'),
         Parameter('dumpsys_enabled', kind=bool, default=True,
                   description='''
                   If ``True``, dumpsys captures will be carried out during the test run.
@@ -82,35 +80,23 @@ class SkypeEcho(AndroidUiAutoBenchmark):
         self.uiauto_params['results_file'] = self.output_file
         self.uiauto_params['dumpsys_enabled'] = self.dumpsys_enabled
         self.uiauto_params['output_dir'] = self.device.working_directory
-        if self.use_gui:
-            self.uiauto_params['my_id'] = self.login_name
-            self.uiauto_params['my_pwd'] = self.login_pass
-            self.uiauto_params['skypeid'] = self.contact_skypeid
-            self.uiauto_params['name'] = self.contact_name.replace(' ', '_')
-            self.uiauto_params['duration'] = self.duration
-            self.uiauto_params['action'] = self.action
+        self.uiauto_params['my_id'] = self.login_name
+        self.uiauto_params['my_pwd'] = self.login_pass
+        self.uiauto_params['skypeid'] = self.contact_skypeid
+        self.uiauto_params['name'] = self.contact_name.replace(' ', '_')
+        self.uiauto_params['duration'] = self.duration
+        self.uiauto_params['action'] = self.action
 
     def setup(self, context):
         self.logger.info('===== setup() ======')
-        if self.use_gui:
-            super(SkypeEcho, self).setup(context)
-            self.device.execute('am force-stop {}'.format(self.package))
-            self.device.execute('am start -W -a android.intent.action.VIEW -d skype:dummy?dummy')
-            time.sleep(1)
-        else:
-            self.device.execute('am force-stop {}'.format(self.package))
+        super(SkypeEcho, self).setup(context)
+        self.device.execute('am force-stop {}'.format(self.package))
+        self.device.execute('am start -W -a android.intent.action.VIEW -d skype:dummy?dummy')
+        time.sleep(1)
 
     def run(self, context):
         self.logger.info('===== run() ======')
-        if self.use_gui:
-            super(SkypeEcho, self).run(context)
-        else:
-            data_uri = 'skype:{}?{}'.format(self.contact_skypeid, SKYPE_ACTION_URIS[self.action])
-            command = 'am start -W -a android.intent.action.VIEW -d "{}"'.format(data_uri)
-            self.logger.debug(self.device.execute(command))
-            self.logger.debug('Call started; waiting for {} seconds...'.format(self.duration))
-            time.sleep(self.duration)
-            self.device.execute('am force-stop {}'.format(self.package))
+        super(SkypeEcho, self).run(context)
 
     def update_result(self, context):
         self.logger.info('===== update_result() ======')
@@ -140,4 +126,3 @@ class SkypeEcho(AndroidUiAutoBenchmark):
             if entry.startswith(self.name) and entry.endswith(".log"):
                 self.device.pull_file(op.join(wd, entry), context.output_directory)
                 self.device.delete_file(op.join(wd, entry))
-        # self.device.execute('am force-stop {}'.format(self.package))
diff --git a/wlauto/workloads/skypeecho/com.arm.wlauto.uiauto.skypeecho.jar b/wlauto/workloads/skypeecho/com.arm.wlauto.uiauto.skypeecho.jar
index 35158e57a930189707b55eadd887562fda35c313..91f7cfa12b58628f97cfe4d7e8b052716e03d2a5 100644
GIT binary patch
delta 9311
zcmV-lB%s^KP1Z^bP)h>@3IG5I004`DkqjvUih+?gihqiMrARCi3Ja<u000b2000XB
z003ibVRLh3b1r0Mc(r^Be4E9U@0suW^t5ctauPerOR=5UdH9jHiJcHze#F>LLhLx;
z(CaGl7e~aF6iH4T+Cs<z0hX3G4UaC50)>_?v<)<u%NCYG7kaz56zGpGq`h=Yx3o(O
zZD|X=+kbZdXJ#bJPD0`ScIEtaX3m^>ojG&n%qK;|_Jp@#)fy@<pZ%G$?!15R+cke!
zaPBYePOUvBblWvv?;XBwq9hSb46F{2el?#%v`;908!*>N1QsoK5iJ9~*GqIi=zkOt
zd6{2AbXOzMC|bAz0#^ag0p9~&2L1*3A@C;fK7a5Rz*tT+3z!X50?UAUU=6Sd*a_Ic
zCBRpK6TmltUjTmq{s{aTFlvb$fCuma0bmvo1m**kKn+j_tO3pi_5jxcCxG7o^Xkwa
za4GOG@Ka!3Jy9QUIq((WC&0W0qF!J>a6NDwcnNqL@T@>zz$%~%_&D$>;9B5r;4$C@
z;D0B;yMS{g+5=VsZNP5eQs8Fbi@>*l*MPSH?<&j%SOatcLqHNZ0z3em0KN+>T}{*k
zTnF3@JO;c1&>EsSz&c<9umczbqCf&T09*`Q1zZQ*3fu#H5qKPU68JXo8{mDwvli<H
z%mW&LE?_tCN#JJS7;p!0H}D1EOTfdxaev@{0^b0h0bT%J0$u@50&f6s0&fAo27U)D
zUk5t??f||5d<%FUcm?<+@JGOa?acwIfqGya&<Sh<E&whBGQcIkHNcI)mx1HJ{{nsn
zyblzgh4}yjz(v5FzyrXez|+8sz`p`-0q+C8_0R)Q2do2Hfo@<IFak^fM}W(LtABwT
zf!lz4fro%^0M7&81x^C*00m93Utlg!1FQtr1Fb+8umczaE(2}>z5pBto&>%NoCMwg
z-Ui+S%w{4#Fc(+?tO7Oy-GB{T3|tS~4%`cT9e4_O2KXNEQ-C(W1_3`10u}+aKqIgT
z=mrLWj{_q>0vHEA0UQNB2RsZM2Y;Rbo&~-Qd>{BR@GIbtfUyyM070M%SOs(d=K_O3
z6c_^z07rrAfV+VEfQNyv15W|}1iS>C1bz<u0dSv9G!s||ECCvU&A@hG7Z3w31+D>(
z0e1rr01pF?1OEs-2fPIQ2>1o?Tfp1|y8#vgOMwPpBd{6R0t^5{z#iZez<=eywZJ{V
zqrmgPN#K_NwGfp8Az%g21hfL(Kp!v&#DH<&6Ts!bHNfq_7l22ACxI7%9|3OyzXPmR
zqB0-^R0B(aI$$>YcAy%l0hRzuN%?rVR)T9JxI%*KBe*z%+akClf~z6zRtQ^^umuU*
zhp;6GCQMCyhA6WksGguE(tpz<bW34<uCxOkKqt^e>Wsm0L_I(+um#u(Yy-{(wgY`Y
zKd=KB0CocB0fWHDfFU3P>;|I1Fkl0FfWyGw0yh9R0yhCS1GfO5C8dw-E2wGzQl%rI
z^Ye820`TX9nwrmPOQ)*<2luUIT$*2@)7&Pf3-Z#wymX;XF9IzBMt_lBtkV-nSL*a-
zy8XF%?JoeXS*pgsayKEpkW~Hbn3v>@lhb!-{?fd5mgbE|p7~m4dER_$^V;F`Lt4I8
z*Uj>W^U}wW4w15}C$xN>mghEC=8b{v>>15po5yd`@`p*;8NV*oX>Rj~PJajKztQQJ
zk-ki)Sr3=%^y^4pp?}kF=JDUjOTU+wW@Tj4?!2@=FI}FO4&|l$^ZKd*|ENwkAbq7y
zH|C{TZ&&H`ro47|EwVB_dGh_sCgm^4li#~c+5HBst7~+cb@geTW?g+or<0JsR;O84
z*XuOv=Q^F{xo6YY<na&Z@w01scAm{_%1gKCv_UG?^k8R21%Jns8|5A=Kutr^0-CAm
z0!>FWO=x-%@gCYF<$d@Y)pSDBL&W>4MV1%hZ;qxTn#PFtl%Q{F`YlaY3#P>s1}%o=
z{Xb$Vs15lNUJGJcOZRE|sHR_+bOSx5^Z%jgpEUIfMJquApcj&&`!vmHIxeYdhw~0C
z@0D~7RY<Dz)_;h<{lq?aJ*9|!(;RwJ(z%ja(B}iB{M4(Oz9y-I{;#B)XsuuxrY6BY
zY?<^$4)p(krVmQ$qJNY0Y?>t$Et9l^mP@*k)@j<P=~<etm$Ze3G#v(YV%Kv&E_ew=
z-SU3H^a)KD3PsP>bd#jBX)~x>*K^|(TPfI%RG#S<B!4CPfu{eW>8qN)CaFa~k<>vy
zm()qW(DdImeM{0sy8RBR9}m20v+i$$P~}~ko}+2EroED`rjJXygd&nI)pRB8mUNY-
ztz^r6P$kcWf*f5X=f&rSTQK!dzoebCL$IAIIiHsEp@n|Q-z>`ub$OvKFT@G_yrczE
zt`Mj24u5Iy%Vl{H<e!z)pp%;ZP}863@>OzQD18?r0{CZ1*U<lwbRB(H(nk7?q$}yS
zlCGt9B~|(=*7_>e`YJ}tJv!ejX(4Tq)JI$8zES=0{wb9ELd`3n`2pR3K=&We>l@JP
z8qn(*z&PHPRE;a3#}z<C^k?1PBDufT(_*2@mw!mA?11S`O)mf~N0h|<m!sa7B%Mw3
z1jiLCB!9N%&qjYEf@6%el0OG0prR`^_0ye_D*1Vcz?dI`-4zQy1838}5})sC9V?*;
zUcV|`zY2e|1;-D9{DRN^fGl64^|KW8A4r|?FGyNUKhpXCA^3=EmU7FejJ_u6Ou5d>
zX@3@dhnSYrPl?a-Haa0`2Yp-8dGvirgS0^Kxvu)FgSWp^(gm8TeOnJZdYqWfp*M)*
z%Y}3oaSX75-jTGF48gHxDZNgL{*pNEtf1#4ok4R2#|9z#9dR70`fG&8>l7T1Dt$CT
zLqC?ZiQXeVk4ou_#AlJBEt;}F5YmsR7k~Trw-6ZLv{~i(SqGLT7e8GBv?24JF6Vt&
zvPs2V+46prJGxZfcbf81l&{w1g{LXM4CT9Yd66Dpe*bqMb3~UH>vB(C`9mmwP?!6s
zjsFwC8`+GWub-xtzl+Rkx_&^nUz}HN!D#-3@~bzivKu-Ty}eVN>-U0wsZ+(toPT}{
zcv{PRFOUB!@Naqf-?7Z*$u|7D{W+R0)wD^=Y}>5*$)<Pe^4+>Ty;+UP0WSBkqE+cL
z>7NJhup4upWmpt%xRXL=0S)4KDT17kb=S43wcjtJC?5sIA1NNX8oFXnC}ckyT2*Wx
z_g5nC<#WYgJ!Q+ox$>&hmUp!(`+tc07bCx4-XDC(@mRgkcvf!f8RRT2=f<eH&W=`f
zXRCljg>Ye>vmhT2mE(5g6Y)?P>iR@7<i;%ewxgt>6f^gVvqTx>ofI@mDNtFts+9s(
zuhX;wGkRU7wLkP3>?xm-49&z|trjJ@{$gk7Z}xvvf1f%-e{=qe`?H{V?tkwFy?!q?
zylGxaiH7;`Oht098PZN}YgPA{xPKAkd?IM>!6?|L`3znw@XQJ;NEMDcjP*K<Iv%<K
z5xUP2bh>5QMmp}l5hXrHvLQoNj(Et0NX%;%n}rl8t@#t%-~zS-QM1g_diZ*)@;lS)
zp~1jxd3>g}_os7qQ-KkCL4OxA74e4Uawcx%oG5?3Roy$eJ!hVMRUijx)B-g$HD5DL
z<B^rR)YM$-HOn%@c*g0}J}cYyD}SYJNsZSG!+2!jWKR{jp0e$quI-<GVB4<=VN7pP
zQ#sm4!XMQ3Z$Feyc-+%9p{e6Fhr@WJKfmoFX<6`5VfFlCzkC`|;D6LU#vSy$FMZ50
z@>vy*a;k98LywoEmd}$69RfcYio<?%Jqj3ixXHP~?e;afXHuXh9$HFQqehbL$!s(|
zXzd!D=3aNB`}cnd1R9MXO8*A!W$UeX&q6O}QP6XM0-nlSTZwnW?XthS&|kGX+gHv1
zX5XmxMN62Zj!Nk~BY)no8oQ<ld1aejVfF0b#cjN2cn4a-i&MFhSW6W`?F50n_({0~
z7V^&Z7w{aR$+_qOG{?UYlDwm5Vn<h#vTZenom0lJR*u1?$1oJ;IE?*-@)1Z0-g`mX
zhSr1T=ZJlU+Vi+&5YJ(Tvj|#K^$&zqJn-TsHHR5w3ih+6Jbw!vbV*n}v)V6jygsy0
ziCaz#Biqdo*xUXl_V^+Y=!O$lTx*hBG0AmIa#v1rU6b6_Nv?B}yPdg3h#qSG4E!2+
z19%1awu%J`P&PwSuf9LKWUR-UULz@HBC1<Nby!rli|S5M-Q^;67GEA#&*K6efi;1u
zKxx3JfP7F~M1RSK_2f5V(2nBFR2(ygRuyM~;#e{E(UOx;97hZzP@ECPamKKMfo+wD
z%~)rM`VH0+sL6T(wOA9N4xT$GYMAnjR_k<iSlwrn4WGoQ)Va+2>-w<L!CdsVKlCZs
zjt@F0kg<-?IHqNGqouh2^Ku;*U?eQ#(0ce>Se-Xn9e;2XFoE9AmO3aP#W|!n(1A~L
zMimD-@KT_m5;5m)QK0AN)ARGn`Nc4X$@$!KhWR|0n~yJVKE5gQc_cR<?0WybdOn+`
z%;(W*^C`qw=b*Q+oKF!cPE2tyAHU{|C=NzjEa%gL`4s8-`1O2>^?VBR=JWU&=JSua
z`4r~Or+;wDe4fkArx5eGPtT`C%2=``qJIu6zsfs&SLF=s^&==543z=_poEHK?8mQH
zv~1R&4Q>ihAEULDo(K(YD$%hYzkU=}`szaqetn+u>nAyWU<&`u9KUo5|CeDEKjivE
zc@a&<qrVNSXU<9g0?cVHv>W$-Le6x*|87ZlZGW11nmBcqd^%;KP67Q9ZSeDwfE9oz
zUnaeH80W-Mc<*@VO8NoXybAl(=c;gEtwZCu#Z?HLEgp5YAV%@>+47(~TdtR<2Yjxx
z(YYA)4<bSddj5d%+>F)md6;uE)%>c^bopKV{m)}`-lY^QxR~Ob?x6>p8ZGu`6Bt<|
zM}Is1ggo`){ws(*+GTk6dKx{o=)H<6yy`6QqJEh?3m(T<v{XSnbiK~s2ninJ#Ta9?
zr_jSapRS*3PoqO|9n>gRO0FQ5u6eQ$XUiq9jhc6}Darp@j{o3kQZMDDJT?D>p8IQ_
zDKu*?$L#xSj>r~nV0)f{yXY)A)5Y?cH-A5y<IhAqxEr@idnlBjbC|GR{(OU@wnH*M
zlP;EYwtP-)V&qpz>LKqXRqHaM>RKVHZUSxx?gH)uz9{HnaY@y2!S9cWufUh6{kFVa
zeMS>l8(0*W5it3=Q>ihFRxg}GftJdWFizbksn-x@(D)TotJf_YLE{xpJNNr<;eVBf
zooykPr-&*er<c#l)x5>e(74~ucJ&!hz^X9Rni_IFcgxe(BhxGOxt@~e{EhOQuMDer
z17$epDl5>RiT+H(3X}$|H1%4B8K?|ePL*2KD-4r+H}ohSZWY5?7|(FKdcItN=p$fO
zu2OrTLGFR1+yf+gz5?<%H${IGwttI@Y|!y3X}jT>HT*b1t{rq->V+Jy?N#mSxptuQ
zRIM(cz`3W@s%KKGK_etUT{-QB&c&Fa-Th~(C*^aiQS&Cr`wx%hp8sY&yH2NPjMt&#
zJ08P7w5!keD!@yII$6VhjumzbLq;bSqT)70-pfRYIC|#CBqeC&JnEyG_kZJ|ex|>R
zhjuXibv!h{^p_Q)3fkC9yvz9x#)p9N+%8ggonjg55tT`vL)zWRcJ<sOJC;yxEbuv@
zHtb8UXcW*(gO8$)>{$5Bnk@bOU*ZjgD6RQ5x2xjw-~W|4I?gc101eAI7Bj^h{Y){(
z5~d$<jzZu4%R2NK>OVs2DSxaw`{w5OyGVU%p<b08>bwtPelgr&_`JzJN2uvg{UrUp
z$XC!hr2dZ2PQQw+eR_@SI@D*eLDyGs`aePyPQ-F<6-&G2{eA+s6^@;+P<QbuW#zi;
zFmgq7KlH<Q*r54U?6rrf!k8}KsO67Pg*CnGJY9B~Z0oDCElZBI5Py{Czpq1m<`py_
zLVdL>EcDbMco+2JCdKp_rq~U9%V;d{(~g^}sL?{KW_=mfv4^@$nF`s|MU4d?!>q4X
zGqcoaEcp~=23q0KY{ED=Hi?J!;Y?~QXw&U&lI>MEg4BP@VybYd(YWNkti}l(bl)b^
zN0H{y;Ouqrt>1RVH-CMcy88ZF?OV@OyJ3jB97Py)fNJhz8&d0dZ-@G9yuvY?DhlR6
zrvX^s0oXt?w4WZO32{5@)>n}7e-1pRpXK|4uhAE#l>Zp>tOeF;q;F%*c^7#3Ebqp7
zT;PuT&td9}`@5JLL0^Xm^j7|`l>$X6|E(-v+*@2&6qvt1bbl$|XjQI`a|g1yjhtJl
zbL^o`lFt_prRiC!c|7h<NzcRQs3~Xkvkvurg9=ma%c$I!CbT|=700cvVK;R+*zfTZ
znxMs;C>^kT+6H;2n$$mB4e6yK)o=&(n|u~b){n~iHLo*ovUbgn)qT)~T~jLKH~0zR
ztQO7{NE^})D}OrGz75iOqC%+gt&rmr6bK|YjZoO&{sr}~tS0VTJxj{gU!SZ0u~X|C
zXRhzlvE;d^e~@Egx4(MuL=9?2c>SC~_g{#gNnL@p47y3^v?J(VkxiRHx5%d5LC-M?
zLRs;KYw4I5=ZgEA+4}DN{=?7%;x+djS)K^GtFm=rp??J;=<%YipesB+_pTF*A^UV*
z{foH1`+^fyxDyOhw<FnbAuU7y18C#Z@ErW4f~|9uKb<;J4XGIYtqYdz-jyfu?q8Cj
zF@7fTHsxN~=ils+GXeGe7N#|tF41(Qru;nv{_f&xP1k6;R?|-gXv*tKozMDNK8KHi
zch@xj*?*e<$TWUf^Pig5?ss(Fq4OLco(!n(zPubz-*w^fp0DYkrf*DZ=bdT!Y~R`M
zp|C#wBcQ$;!}Uir-K!~o7H+|~FVy)_O~*9lwrXkeerCvgt+YLdJXO?r<dC0ekp2u`
z$u89S3dl2Ef<NZ3()@+AP`B5b(-+fLUCuA{oqwARxiL6&nImtW+0QAM`ZWz|n*Bb{
zd`%bR=8&aA)1d6DR;E<hDx{dM(eqso+MwGB=dE47-Z8@vZK&!y7|TTW_C}Ib(ZpC)
zBsErba5OTWNmPx;B-t^s%}(vv5o<waERu;O;#F<2lpW<1xvB<QdUmw;k*FcFX2}2<
zfPbg9b~KW)<IzJ@oJ-b5N9{<8th!`;ghV|B>eIu~NNTwLV5Ih7BDF8Z>}GN|M@M7v
zSY{(Rn-w)SB4pdx#O=1EM#jhNcqUCVTO(;Ze@t~3Mh-;C7mkdMh7w8Uq^Ufd7#|%D
z#S@v(o>+W1RIw;sA>U}lw328do{2;=N`E324`ue+SzbCc8cS#D$ZFfVa|?MUr@p8?
zl}e;S2lvKC?NBDd69^5Dk0sNG(#u2kL@X0d4BH#1pwmug##46xp`=Zsi;S)wU<-+J
z$T;U55<O(~w0HEA(Sx!cFne%b^dN&bF5{$w-@7Q-6NwL}60za>M7q9pJT^L9HGj~)
zy{~KQmL@8lS{5H3wVSBA2TNL?El}$TbtO{u(L~Cw-w|uG55%G$MsVxy3o-2`YW#45
zTN0U$1P0MQ5w+!FG|`g3R<q9@Ma@L&gF4ATm#Oi1+)mZ!7C({d2R96RXrdZbGc{JP
zY*<&WpKdKpwEPT`r?K`GO|<&MOMmAKq>0vk_*!{J@{xMm7K=yss#*;nzE*#1%!Zzq
ze&`x!ZauvZo!im9iTdd}Yy4<6a(lap>ONA<CaUNej*K3N?Ssi+M@wdXdptUtNMlci
zM<Z#pIsY^=U2I6YeBo)zd+o8^TEK?LywiyE#YW;0Ub!ah&Qpu~_ofmDQGd0(huu?s
z43;>)XOEq-hqv32VP1n%OLnGW87?Wxm2|{-GtZck&q~eAal7Kl@l0PPWk<%EXwK=_
z**^Wb!c#ffc1sm!G!h@FZ%riNyW_dRN@jR(B-Ll{ABS(p;7amKltzp5Sncugv1}(f
zMsDzmGwCYw`|gTo?2)`7N`GcgB0kbYbMrV`5`E**y&W-obXdA&Uaje+y>@1AB3m5D
zE6zH%{C>Bk5>cC{5j>SCUGH=yZ6A+ku&t)H486yAsIyPu<=U7cekh%>r|CtSP-OS$
zWXt23*l2xADit}D&RK=zbz$Wq(t{S~aeHulWwn=MG*Q(wPV=e5-hY@gLMeq1Av>~c
zzN$T*NgZmU^H0Y<O^YAZMQxlq6*S#MeN!3#^}Y1jleQok{VCg)T`$OEB0PwWr&91(
z_1wx1#43D_o>3q%p2;)u*?EGaiII^QTeW?_9?cot)FMze7Hi861O>CUBtpa4V<wbN
z+R@mam_1D9)*b!i+JDv(?r!O9C$CNnb+wUWTi2HGW^!(`6UkAVJh@|o9NW7(H=|Zx
zTlY}c7EZK>w{B_cBWGVbf{S)4>Kjk(iA3!Vgk=~5nf)!D<mqoeuYYKut9>Ue=E)6*
zFul;hNG!uq&>n<E7;!X`31#dF6;+W#>Y9pnbhWh)bcNf8`hRwIZENTJ*4A^{!~HsM
z?AS&nrv`Rq*~lUkORKPr!;AGH6vTORgffXx%1+yvYzRi>lLZLQ>`)|EQg*5#s7?gJ
z*8v1x1BkV(fv!OWY6A$!1`v=9a6mSI@C<K=$_6+#^A5y@?L;Vwkdwq98G{fRL{%r=
z@B#ys(TF+7p?}@3E?Tqe|0|4G_Yta1i6cHre|dpK>8{iH#$BgzYhs9eLnC`8V(~qR
zI@l`B7)mQ^8QP=FMRE%wQFfahqmhv`IU_23F4OT{-ND%Kh@GkHhoua}?1SWuB$L}B
z(S4B-8^Xz?9UlfwOE*@ud&==iuHDLwl9yMZbv%<n%YQyjw~eRd#K_G#Y3iORA52>!
zV>T7Y%ZRd3a^S`h-ACn;w8V#Z!i+l-sV(-wowyq$4zfTZZcCE3X(@DCCqt3C>=ZD{
zI_?HjuHzd>3#ND=mN`WJN!e5+#si%(owFVxE-g46H;ve0C>9^uorzP`2MNTXIw@80
zK~m#sJAV}$rphzPKqLwM;4U^yE(ncbc2JbM1%+`_%Vneri*%-so9Y^#nnyownUCQb
zR-oM=I{+%l%k;*eGL#S7>1Zk@JtLLoWy0AOT*DmqCk~Nkc=G0%-Ofci(JuG<FnM*p
zKQcnaIz43TLicdiE`&`co0bc2a%2vh4=r*_f`2oBoQQ5BqiOOh+BFi#MTPGf<gv4!
zoGg37j#2^N_uBM;0(qIvJriBn95g$RH_f4XxM(0UI&PD-2az3l_vGR`a&tP)`gY=?
z8cXj5O{B)yYNZE+a0;bq#G7fFg?-c(OD9Johr&Dyd$S!I*_)x6)A>7N!<oJ0pJZ#n
z;(tkw5-DItR%0GyI@BPFkjx7#rCe7Wqd+i7PGq|6LsDKHT;xJhS`G8IMKI*Ftb>3m
zX{WGJyvXPXN)}`<gXHE+CX&j?s><<5iR|T-%4J6Rsn$bndA3wGrDVIEPK>9bY^x<x
z3fS|=e$*nkv_qqky%D}fV+yf&UlcI_jDK!#B)x^j4On;qKcC1gdR`{C=y|+pi|&r;
zSdA=ju$%b3E^Q|xifgjpbdD+q<xw<L8<i|+G^0E!rBa#PhOJBPF`RVlfXFd+Xb3}e
zf+P<PlO;{aVn;z<e%G#Y#$-BAJ^pwitTuBm+&24RGqL+Zaweq0$OR7(i$_Mm9e>B*
z@CHM`c|~589Kt50f~0cc%BAzP#%xR({y(Xf-v^qu_0@vhGKXNFQ`!j?W>Ye(r;=<|
zjg$xKNy>PpKeC%#u%jr98woziy0}SBY#nD-d_)eaI0^G%bBgZkPhmAsq9S@KN=^yw
z$;3R!4ci{>;pK6r^m&uAu{luDA%BAn@}?%WhO+edD7ImNPVhC2d^$5Ew{~%AJf45-
zQb9U$z}~Jadeb<Ra0>G(Iny>AD3p+vJ3+4p6{+lycDCeBXE%xq<B>Ie%9-mGo|T`=
zTVqe|GL3Gt$sx3&-M1q>YTHQ=wf7`ZZW33NWE$jPjL%d_+7bujI@x3Ifqz<La=Y{?
zE}7nuq#_Q()ILh@O+Y9UNor?9{>ilRP~_rAJ?z4*jGPp|=gtE+=Z4rOt;}AWAWnX-
zYCt6wXp<u&gUwP&)`u3QLyLyhKQAgL^udFab|@v|+MD#{rZbf#rxlpOQq!9%#!sTC
zcnS+Mhm7(yD#&7)9BZ;#fqy!nm9ZDA%%rKinIU(v<A8Egl5E{WPMN@p9N=)23MFAD
zAY1jy?2rsntpmIn-Tb~qwUl57S|~|g4bG|>u7fHTqC%Z$pFkLvrV^c15tKALFSFE~
z$jxcVEs!a_DzcFsaPp&_98Z<xvRe|mqKlsd^G<af<nxcj1Q`<zB!3Q3CAo?=(7AZO
zh5k-}&~5Vl2Kj!Ae81RuLVQ8EijGg1bfw`uDrS~Y#<<6r&bv|=Po2W75f2)!q8Kd~
zM?kwxajjwPGmTq~IuY{Eoo~{!VhP<ZjGr6-j`I8H9`5oueNBkRke}#2-koltCv@(3
zcWg%sYN%YS`#5r6%zsM8y1&svJB$a6XJtpuM-AgX)4JVQ_7l@_r!l+Rq{oFZ-!xtk
z8)H4fGR;4Ty4qO9N{6{2W?b~P(~LMwY86LOdyqPeqXrNBmKVhgKdlo_Np2G+$lO7b
z9x~iVCrt6Q;cTW}EljsceJvx``LxU+nU>RL7XLRZR}(E)e1D}5W))E_^J^8qR`F{&
zT`!(7T+0V*Yw0XxV-wWD+*W?u$Zu<yON)60zexuTdRbV7$HnRkTt)Lu>m@OFfeCHS
zK5Dw}FqSuWn=Ytg&|#Sl6m{S4AXA_edT_EHn!n_53d13sG~eNHxEyZN{Ek@Uv_4zA
zp?0IgH1^MPkblE+3a7*Abh@1G=GcqEUz)8WgsSAUAl@-m5*%S=g`8F}TPlQUJS!IU
zIt(G4##9l*;grppT%;vB!OhQifEZ}X!JQx_E27eLCfdx62kBfd6gBP?FALW>F)=e>
z5i714gA;xy(RTAr@v4Esd179%DLxHjEicwGG$zP$DStg5HR<z$b!$MkXQLk@INuad
z9Gx%j6t44QVs?JhGthLm!A<8k?9Vp*Sz$aWZ5ihEd84@52z;&CNX+ZS%Sc^8-xk)Z
zQs9<Jk)vlf&pt|z2=mnstXiu~>lbWV3ppLcTO0KoFBvz0S8KXnH0o+iak)|VW7GLP
z!}(*AE`Nh%Z>TlRo4CaBFqarNa*6f#C~2nah53wl#duQIH($d{N{db7X;Bv&ya3z$
z34sc9uRtR)v7lHi@EZr&h6J@6^rEmzK5wjzxQd=N9akGcF{9YBo)c?^Vy5?7Msc_4
zK5iJ;!rvE0k7+z346($I<+orKZily-hK(b}Z+`^O)`WP=)uwT?;cOW-=~498JYgic
zC+v0ctZ)gp(^%{f^Rf8+b^I%Zct-G$=}Dt*&=jcO+}%7#mz<ux1d8g#NIqj&G1K}J
zW@kG7%<tycd4k4cqV7JE?h_(riu;-Gy4R??@7d<&qb-BRMe~l5Q6^q8=8AG>Hc@4i
zB7ad{Y|Joj7gcWmrN(@foW1E%qimKji^Z(6&1D5;4P`|tE6S`qneu#@6_A-Misu)t
z)J2v+$w6bLEGaK4FD&<!7brnTnOSx|MElB$6~mQd6qTJ_=1^k|sAhs_#-FWsffQPm
z9ibcbaxA<%tg<hc{r$RnQT93Pw^>3gxPSDpb=~5Scw(^-uLFmxg}4iNuG$pufWBTM
z#0yJ=cxoxqzz>!|X1Nd#0GHK*2Ru<H#IbsmH3;!8aB_tZ?*S)P^0%CfW1+??4_iN2
z>Etgb-WC$K9v0Ja76eYL7Do<SudgvY@2wG@JJ#~Ii9A!qH$v>GwJi3?I^lT^cz<gh
zixo~4YlYZ#jVyNfEW>l`Ea7?LEV6{71fB_h*M&MU>DSNNEUsCPK>{xTZvuy#$Pk{H
z@MFD@xT|T4c%w;(cg{xXCL!KxfsM98I&6uT+YIq~J8E~3$DlI(<*>=WUFiIoPI34y
z>tv_Hbc@hzA^!|dm0@5IAHxve?SB-k{LN0|#AefYqsuT3_Xy*KUc-26i!dJAx>vl#
zzq?VA_ZfDUW`7roKLgMHHWYsjp8b6&{@g$N8&UjOc=mUq`2S~Qe=ExLtIy{7yA>j&
zz9-=?g-l4v@c+3Ke)WAm{tW>mr26IGmNK<G|NlKJq`o7^|L4#VQsd+Qhabpa{NV3^
z$p5$LSA70WtN#R0O928D0}22D2mk<!fs+a*IRc7-lSL*#4vK-LNGuWx3#uak01Qi$
NlO`_)iX;F40032F?|lFO

delta 9684
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
Wg}EFh003l8lOZK92K*%e0002@f8SjI

diff --git a/wlauto/workloads/skypeecho/template-agenda.mustache b/wlauto/workloads/skypeecho/template-agenda.mustache
index d861d194..e49fb872 100644
--- a/wlauto/workloads/skypeecho/template-agenda.mustache
+++ b/wlauto/workloads/skypeecho/template-agenda.mustache
@@ -10,3 +10,4 @@ workloads:
             contact_name: {{contact_name}}
             duration: {{duration}}
             action: {{action}}
+            dumpsys_enabled: {{dumpsys_enabled}}
diff --git a/wlauto/workloads/skypeecho/uiauto/build.sh b/wlauto/workloads/skypeecho/uiauto/build.sh
index 776bd5b8..37d7d301 100755
--- a/wlauto/workloads/skypeecho/uiauto/build.sh
+++ b/wlauto/workloads/skypeecho/uiauto/build.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 class_dir=bin/classes/com/arm/wlauto/uiauto
-base_class=`python -c "import os, wlauto; print os.path.join(os.path.dirname(wlauto.__file__), 'common', 'android', '*.class')"`
+base_classes=`python -c "import os, wlauto; print os.path.join(os.path.dirname(wlauto.__file__), 'common', 'android', '*.class')"`
 mkdir -p $class_dir
-cp $base_class $class_dir
+cp $base_classes $class_dir
 
 ant build
 
diff --git a/wlauto/workloads/skypeecho/uiauto/project.properties b/wlauto/workloads/skypeecho/uiauto/project.properties
index 6e18427a..ce39f2d0 100644
--- a/wlauto/workloads/skypeecho/uiauto/project.properties
+++ b/wlauto/workloads/skypeecho/uiauto/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-21
+target=android-18
diff --git a/wlauto/workloads/skypeecho/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/skypeecho/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
index f6ad9b16..54799d80 100644
--- a/wlauto/workloads/skypeecho/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/skypeecho/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
@@ -30,44 +30,12 @@ public class UiAutomation extends UxPerfUiAutomation {
     public static final String PACKAGE_ID = "com.skype.raider:id/";
     public static final String TEXT_VIEW = "android.widget.TextView";
 
-    public static String sendSmsButtonResourceId = PACKAGE_ID + "chat_menu_item_send_sms";
-    public static String voiceCallButtonResourceId = PACKAGE_ID + "chat_menu_item_call_voice";
-    public static String videoCallButtonResourceId = PACKAGE_ID + "chat_menu_item_call_video";
-    public static String endCallButtonResourceId = PACKAGE_ID + "call_end_button";
     public static String noContactMessage = "Could not find contact \"%s\" in the contacts list.";
 
     private Map<String, Timer> results = new TreeMap<String, Timer>();
     private boolean dumpsysEnabled;
     private String outputDir;
 
-    private static Arguments args;
-
-    private static final class Arguments {
-        String loginName;
-        String loginPass;
-        String contactSkypeid;
-        String contactName;
-        int callDuration;
-        String callType;
-        String resultsFile;
-        String outputDir;
-        boolean dumpsysEnabled;
-    }
-
-    private static Arguments parseBundle(Bundle bundle) {
-        Arguments args = new Arguments();
-        args.loginName = bundle.getString("my_id");
-        args.loginPass = bundle.getString("my_pwd");
-        args.contactSkypeid = bundle.getString("skypeid");
-        args.contactName = bundle.getString("name").replace("_", " ");
-        args.callDuration = Integer.parseInt(bundle.getString("duration"));
-        args.callType = bundle.getString("action");
-        args.resultsFile = bundle.getString("results_file");
-        args.outputDir = bundle.getString("output_dir");
-        args.dumpsysEnabled = Boolean.parseBoolean(bundle.getString("dumpsys_enabled"));
-        return args;
-    }
-
     public void runUiAutomation() throws Exception {
         // Override superclass value
         this.waitTimeout = 10000;
@@ -76,7 +44,7 @@ public class UiAutomation extends UxPerfUiAutomation {
         Bundle parameters = getParams();
         String loginName = parameters.getString("my_id");
         String loginPass = parameters.getString("my_pwd");
-        String contactSkypeid = parameters.getString("skypeid");
+        String contactSkypeId = parameters.getString("skypeid");
         String contactName = parameters.getString("name").replace("_", " ");
         int callDuration = Integer.parseInt(parameters.getString("duration"));
         String callType = parameters.getString("action");
@@ -85,19 +53,15 @@ public class UiAutomation extends UxPerfUiAutomation {
         dumpsysEnabled = Boolean.parseBoolean(parameters.getString("dumpsys_enabled"));
 
         // Run tests
-        Timer overallTimer = new Timer();
-        overallTimer.start();
         handleLoginScreen(loginName, loginPass);
-        selectContact(contactName, contactSkypeid);
+        selectContact(contactName, contactSkypeId);
         if ("video".equalsIgnoreCase(callType)) {
             videoCallTest(callDuration);
         } else if ("voice".equalsIgnoreCase(callType)) {
             voiceCallTest(callDuration);
         }
-        overallTimer.end();
 
         // Save results
-        results.put("overall_test", overallTimer);
         saveResults(results, resultsFile);
     }
 
@@ -124,13 +88,10 @@ public class UiAutomation extends UxPerfUiAutomation {
         useridField.setText(username);
         nextButton.clickAndWaitForNewWindow();
 
-        String skypenameResoureId = PACKAGE_ID + "signin_skypename";
         String passwordResoureId = PACKAGE_ID + "signin_password";
         String signinButtonResourceId = PACKAGE_ID + "sign_in_btn";
-        // UiObject skypenameField = new UiObject(new UiSelector().resourceId(skypenameResoureId));
         UiObject passwordField = new UiObject(new UiSelector().resourceId(passwordResoureId));
         UiObject signinButton = new UiObject(new UiSelector().resourceId(signinButtonResourceId));
-        // skypenameField.setText(username);
         passwordField.setText(password);
         signinButton.clickAndWaitForNewWindow();
     }
@@ -141,7 +102,7 @@ public class UiAutomation extends UxPerfUiAutomation {
         UiObject peopleTab;
         // Open the 'People' tab aka contacts view
         // On phones, it is represented by an image with description
-        // On tablets, it the full text is shown without a description
+        // On tablets, the full text is shown without a description
         try {
             peopleTab = getUiObjectByDescription("People", TEXT_VIEW);
         } catch (UiObjectNotFoundException e) {
@@ -156,7 +117,6 @@ public class UiAutomation extends UxPerfUiAutomation {
             contactCard = getUiObjectByText(name, TEXT_VIEW);
         } catch (UiObjectNotFoundException e) {
             contactCard = getUiObjectByText(name, TEXT_VIEW);
-            // contactCard = getUiObjectByText(id, TEXT_VIEW);
         }
         contactCard.clickAndWaitForNewWindow();
         timer.end();
@@ -189,14 +149,10 @@ public class UiAutomation extends UxPerfUiAutomation {
             initDumpsysGfxInfo(PACKAGE);
         }
 
-        // String resource = video ? videoCallButtonResourceId : voiceCallButtonResourceId;
-        // UiObject callButton = new UiObject(new UiSelector().resourceId(resource));
         String description = video ? "Video call" : "Call options";
         UiObject callButton = new UiObject(new UiSelector().descriptionContains(description));
         callButton.click();
-        // callButton.clickAndWaitForNewWindow();
         sleep(duration);
-        // endCall();
 
         if (video && dumpsysEnabled) {
             exitDumpsysSurfaceFlinger(PACKAGE, viewName, new File(outputDir, dumpsysTag + "_surface_flinger.log"));