From 6ffed382cf5a55f80493facf6d91a88be0fdb3ac Mon Sep 17 00:00:00 2001
From: Marc Bonnici <marc.bonnici@arm.com>
Date: Wed, 22 Feb 2017 16:21:10 +0000
Subject: [PATCH] UxPerfUiAutomation: Added setWorkloadParameters and
 getPackageID.

To work around appshare requiring access to protected variables of a workload,
a `setWorkloadParameters` method has been added to manually supply a parameter
bundle, and a `getPackageID` method to retrieve a workloads package ID.
---
 wlauto/common/android/BaseUiAutomation.class  | Bin 20359 -> 20359 bytes
 ...UxPerfUiAutomation$GestureTestParams.class | Bin 1554 -> 1554 bytes
 .../UxPerfUiAutomation$GestureType.class      | Bin 1287 -> 1287 bytes
 .../common/android/UxPerfUiAutomation.class   | Bin 1271 -> 1546 bytes
 .../arm/wlauto/uiauto/UxPerfUiAutomation.java |  10 ++++++++++
 5 files changed, 10 insertions(+)

diff --git a/wlauto/common/android/BaseUiAutomation.class b/wlauto/common/android/BaseUiAutomation.class
index c0dd0a1774f1034b86ad970a81ea53f49463da4c..674fd94c504a4adb1f0f3582e623217fad696565 100644
GIT binary patch
delta 228
zcmWN?zbixm0KoC@`!2FPlR+tiQU-%ED`ikFrI?t-rc4G=<oS7yL+a$R9dWpG@mvnM
zD}%v5V7f)h|KNR=Pm~X$d~iFP8egZyh|mq%-J;WNy4|7AT?R}u<Q^ktm~@|M512E{
zyoW4##G1#XJ)vZd*i-7B@#A?pPOS#Z1zNqJ%}YAGqRVS~EYj}{gUQ3*F=~kk%S?IC
zj1?A=7kyyGM>dVg_(aYsh2)~oRIE|+g@&(u`Nns0(|3NY^JgOn{h$e?3F*yN$3Fi7
DKY&5Z

delta 228
zcmWN?Ju8F(0KoD8^Iv3nOa`S4N*N5wtdv2ylwx8Qn=%<hInH@`94F<aZgO5b=Qy0>
zLT)qo0;XG}d<V~O`K59}Di;)|6QfC*Tp@IoR@Z1ZO{eShxIv$r47kOR5#w$%X@(hh
zn01#0vn1Uka-Wh1R6OLvV}8utRuap>;t9>>Y4Mac&*|`jE-&fzivIXP3k-YBm_;VM
zVagJ7@$=rXWSO-0WPISrN6z94K2f$x&1dSq@MVqf_=d0i`o^E{L1>)@5E0Uyt&V*D
E0|=r)NB{r;

diff --git a/wlauto/common/android/UxPerfUiAutomation$GestureTestParams.class b/wlauto/common/android/UxPerfUiAutomation$GestureTestParams.class
index a62db9e1671530650ff9fc2b95eb0ab24044af5d..e0ab657da79d792abed25ceb6205805054162b54 100644
GIT binary patch
delta 67
zcmbQlGl^%zKNd+d1{MZ$22KVG20jK$22lnp1}O$>26+aX$>OYKl6F8@d!VcXg8+jg
SP}T`3>&&3Q;4*m`YYqTxU<w-m

delta 67
zcmbQlGl^%zKNd+H1{MZg22KV&20jLT22lnB1}O$Z26+af$>OYKk|sb|Q=qIFg8+j$
SP}Tw{YssL%U^RIeYYqTf;0cca

diff --git a/wlauto/common/android/UxPerfUiAutomation$GestureType.class b/wlauto/common/android/UxPerfUiAutomation$GestureType.class
index fc2cf4d2339e7c337c2fe1ecdf169e7a06f736e9..47ddd88d0484417fa65ca17c40d81bb965ce4c11 100644
GIT binary patch
delta 31
icmZqYYUkSUg_%)z@>gbkAgRh?2P9Ki8i3?e79{|j@(E7>

delta 31
icmZqYYUkSUg_%)#@>gbkAgRh?2P9Ki8i3?e79{|h!U-n;

diff --git a/wlauto/common/android/UxPerfUiAutomation.class b/wlauto/common/android/UxPerfUiAutomation.class
index 016b784f1d8d39acdd75838d693c8a3206e5c082..0e6fc94e950818fc0884ff6a579fe7ebe8a51802 100644
GIT binary patch
delta 486
zcmZut%TB^T6g^W4g{A>CzBdZKN&zdrEj|$+7#1W=bm3}Z8=@dh3Yr)f>`h#l{)j}`
zxG=8$3ID*YJL3$n(^=em=G=4cow?tkd&T_td3^(r!Lf`ek`huf(wLK>V?G1{86Fmb
zSd_7ZWqw(auqs1Fl83b*)_FE~B`aY=!seqnO}1LMQPLc&+l^DltyCRqm8eUv?1t^u
z2@JJJYnJO=Sh`c!bJsPiYG;d=^oHtHS}W^j!@a1L|6vj*1WMU%l<0YdmhD2GU_ed$
zbrQ&?bL~A4GrX-}2dac!1v%__Ut}ndSFn!*PZna4LmUx^278Et0#wfs-k<w?VM0W2
zLNrLyI}`7k1k;!S!8lu##r`R>9MzI-1hiBeAuZiTq{TP^6D;<3>T&on$rdw(2y@36
zuXTNhGoGI)hA_;!ax{Wb=H_UOAs=IBq4p-~>kM$2Uwc91iGl8%K!;R2y_K$@*IPiM
Kqtd)japV^unNouQ

delta 238
zcmWlUIZi_{7=*vySaP0ap%AhtK=X<$ge5$79t6UEfE3gbL<rH)P(-xQ&>`P|8z4Fg
z=xI3&9l|bVz8Ot5&+a!FeE)rX0vYF)A}vGPGEc{{z+!@8DcW*@u4RQRmQ}-=#nOtl
zUSK0~GcH?(ZNtvXpdtC&xF}w$i_WfNkDg)QaX{ZO%bcT1O)z)E%iH1g$Z+U5;@Cf_
zw06R&p!1unuH%fJV}`oW^qH#qAN8urZ7;g=em^lOqWq)ICG}tWAyqWO4Mmgbz*0z4
MK_wE(ft7y!AN!LbApigX

diff --git a/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/UxPerfUiAutomation.java b/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/UxPerfUiAutomation.java
index 68ec38fc..88d65c6f 100644
--- a/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/UxPerfUiAutomation.java
+++ b/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/UxPerfUiAutomation.java
@@ -30,6 +30,16 @@ public class UxPerfUiAutomation extends BaseUiAutomation {
         packageID = packageName + ":id/";
     }
 
+    public void setWorkloadParameters(Bundle parameters, String packageName, String packageID){
+        this.parameters = parameters;
+        this.packageName = packageName;
+        this.packageID = packageID;
+    }
+
+    public String getPackageID(){
+        return packageID;
+    }
+
     private Logger logger = Logger.getLogger(UxPerfUiAutomation.class.getName());
 
     public enum GestureType { UIDEVICE_SWIPE, UIOBJECT_SWIPE, PINCH };