48
48
import com .google .devtools .mobileharness .api .testrunner .device .cache .DeviceCache ;
49
49
import com .google .devtools .mobileharness .infra .container .sandbox .device .DeviceSandboxController ;
50
50
import com .google .devtools .mobileharness .infra .controller .device .config .ApiConfig ;
51
+ import com .google .devtools .mobileharness .platform .aluminium .device .AluminiumDeviceHelper ;
51
52
import com .google .devtools .mobileharness .platform .android .app .devicedaemon .DeviceDaemonApkInfoProvider ;
52
53
import com .google .devtools .mobileharness .platform .android .app .devicedaemon .DeviceDaemonHelper ;
53
54
import com .google .devtools .mobileharness .platform .android .app .mtaastools .MtaasToolsInstantiator ;
@@ -167,6 +168,7 @@ public abstract class AndroidRealDeviceDelegate {
167
168
private final MtaasToolsInstantiator mtaasToolsInstantiator ;
168
169
169
170
private final DeviceAdminUtil deviceAdminUtil ;
171
+ private final AluminiumDeviceHelper aluminiumDeviceHelper ;
170
172
171
173
protected AndroidRealDeviceDelegate (
172
174
AndroidDevice device ,
@@ -192,7 +194,8 @@ protected AndroidRealDeviceDelegate(
192
194
Fastboot fastboot ,
193
195
LocalFileUtil fileUtil ,
194
196
DeviceAdminUtil deviceAdminUtil ,
195
- MtaasToolsInstantiator mtaasToolsInstantiator ) {
197
+ MtaasToolsInstantiator mtaasToolsInstantiator ,
198
+ AluminiumDeviceHelper aluminiumDeviceHelper ) {
196
199
this .device = device ;
197
200
this .androidDeviceDelegate = androidDeviceDelegate ;
198
201
this .deviceStat = deviceStat ;
@@ -217,6 +220,7 @@ protected AndroidRealDeviceDelegate(
217
220
this .fileUtil = fileUtil ;
218
221
this .deviceAdminUtil = deviceAdminUtil ;
219
222
this .mtaasToolsInstantiator = mtaasToolsInstantiator ;
223
+ this .aluminiumDeviceHelper = new AluminiumDeviceHelper ();
220
224
221
225
this .deviceId = device .getDeviceId ();
222
226
device .setProperty (
@@ -248,6 +252,20 @@ public void setUp() throws MobileHarnessException, InterruptedException {
248
252
"Device is undetectable. Please replug the usb cable or reboot the device." );
249
253
}
250
254
}
255
+ if (aluminiumDeviceHelper != null
256
+ && aluminiumDeviceHelper .isAlAteHost ()
257
+ && aluminiumDeviceHelper .isAluminiumDevice (device )) {
258
+ aluminiumDeviceHelper .updateSchedulingDimensions (device );
259
+ } else {
260
+ logger .atInfo ().log ("Not an AL ATE host or not an Aluminium device" );
261
+ if (aluminiumDeviceHelper != null ) {
262
+ logger .atInfo ().log (
263
+ "isALAteHost: %s, isAluminiumDevice: %s" ,
264
+ aluminiumDeviceHelper .isAlAteHost (), aluminiumDeviceHelper .isAluminiumDevice (device ));
265
+ } else {
266
+ logger .atInfo ().log ("Aluminium device helper is null" );
267
+ }
268
+ }
251
269
252
270
device .updateDimension (Dimension .Name .SUPPORTS_GMSCORE , Dimension .Value .TRUE );
253
271
extrasInSetUp ();
@@ -1019,6 +1037,20 @@ boolean checkOnlineModeDevice() throws MobileHarnessException, InterruptedExcept
1019
1037
enforceSafeDischargeLevelIfNeeded ();
1020
1038
1021
1039
isDimensionChanged |= updateCheckinGroupStatus ();
1040
+ if (aluminiumDeviceHelper != null
1041
+ && aluminiumDeviceHelper .isAlAteHost ()
1042
+ && aluminiumDeviceHelper .isAluminiumDevice (device )) {
1043
+ return isDimensionChanged |= aluminiumDeviceHelper .updateSchedulingDimensions (device );
1044
+ } else {
1045
+ logger .atInfo ().log ("Not an AL ATE host or not an Aluminium device" );
1046
+ if (aluminiumDeviceHelper != null ) {
1047
+ logger .atInfo ().log (
1048
+ "isALAteHost: %s, isAluminiumDevice: %s" ,
1049
+ aluminiumDeviceHelper .isAlAteHost (), aluminiumDeviceHelper .isAluminiumDevice (device ));
1050
+ } else {
1051
+ logger .atInfo ().log ("Aluminium device helper is null" );
1052
+ }
1053
+ }
1022
1054
1023
1055
return isDimensionChanged ;
1024
1056
}
0 commit comments