|
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,
|
@@ -217,6 +219,7 @@ protected AndroidRealDeviceDelegate(
|
217 | 219 | this.fileUtil = fileUtil;
|
218 | 220 | this.deviceAdminUtil = deviceAdminUtil;
|
219 | 221 | this.mtaasToolsInstantiator = mtaasToolsInstantiator;
|
| 222 | + this.aluminiumDeviceHelper = new AluminiumDeviceHelper(); |
220 | 223 |
|
221 | 224 | this.deviceId = device.getDeviceId();
|
222 | 225 | device.setProperty(
|
@@ -248,6 +251,20 @@ public void setUp() throws MobileHarnessException, InterruptedException {
|
248 | 251 | "Device is undetectable. Please replug the usb cable or reboot the device.");
|
249 | 252 | }
|
250 | 253 | }
|
| 254 | + if (aluminiumDeviceHelper != null |
| 255 | + && aluminiumDeviceHelper.isAlAteHost() |
| 256 | + && aluminiumDeviceHelper.isAluminiumDevice(device)) { |
| 257 | + aluminiumDeviceHelper.updateSchedulingDimensions(device); |
| 258 | + } else { |
| 259 | + logger.atInfo().log("Not an AL ATE host or not an Aluminium device"); |
| 260 | + if (aluminiumDeviceHelper != null) { |
| 261 | + logger.atInfo().log( |
| 262 | + "isALAteHost: %s, isAluminiumDevice: %s", |
| 263 | + aluminiumDeviceHelper.isAlAteHost(), aluminiumDeviceHelper.isAluminiumDevice(device)); |
| 264 | + } else { |
| 265 | + logger.atInfo().log("Aluminium device helper is null"); |
| 266 | + } |
| 267 | + } |
251 | 268 |
|
252 | 269 | device.updateDimension(Dimension.Name.SUPPORTS_GMSCORE, Dimension.Value.TRUE);
|
253 | 270 | extrasInSetUp();
|
@@ -1019,6 +1036,20 @@ boolean checkOnlineModeDevice() throws MobileHarnessException, InterruptedExcept
|
1019 | 1036 | enforceSafeDischargeLevelIfNeeded();
|
1020 | 1037 |
|
1021 | 1038 | isDimensionChanged |= updateCheckinGroupStatus();
|
| 1039 | + if (aluminiumDeviceHelper != null |
| 1040 | + && aluminiumDeviceHelper.isAlAteHost() |
| 1041 | + && aluminiumDeviceHelper.isAluminiumDevice(device)) { |
| 1042 | + return isDimensionChanged |= aluminiumDeviceHelper.updateSchedulingDimensions(device); |
| 1043 | + } else { |
| 1044 | + logger.atInfo().log("Not an AL ATE host or not an Aluminium device"); |
| 1045 | + if (aluminiumDeviceHelper != null) { |
| 1046 | + logger.atInfo().log( |
| 1047 | + "isALAteHost: %s, isAluminiumDevice: %s", |
| 1048 | + aluminiumDeviceHelper.isAlAteHost(), aluminiumDeviceHelper.isAluminiumDevice(device)); |
| 1049 | + } else { |
| 1050 | + logger.atInfo().log("Aluminium device helper is null"); |
| 1051 | + } |
| 1052 | + } |
1022 | 1053 |
|
1023 | 1054 | return isDimensionChanged;
|
1024 | 1055 | }
|
|
0 commit comments