Skip to content

Commit c3d434b

Browse files
DeviceInfracopybara-github
DeviceInfra
authored andcommitted
Internal change
PiperOrigin-RevId: 753832573
1 parent 66178c6 commit c3d434b

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

src/java/com/google/devtools/deviceinfra/ext/devicemanagement/device/platform/android/realdevice/AndroidRealDeviceDelegate.java

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import com.google.devtools.mobileharness.api.testrunner.device.cache.DeviceCache;
4949
import com.google.devtools.mobileharness.infra.container.sandbox.device.DeviceSandboxController;
5050
import com.google.devtools.mobileharness.infra.controller.device.config.ApiConfig;
51+
import com.google.devtools.mobileharness.platform.aluminium.device.AluminiumDeviceHelper;
5152
import com.google.devtools.mobileharness.platform.android.app.devicedaemon.DeviceDaemonApkInfoProvider;
5253
import com.google.devtools.mobileharness.platform.android.app.devicedaemon.DeviceDaemonHelper;
5354
import com.google.devtools.mobileharness.platform.android.app.mtaastools.MtaasToolsInstantiator;
@@ -167,6 +168,7 @@ public abstract class AndroidRealDeviceDelegate {
167168
private final MtaasToolsInstantiator mtaasToolsInstantiator;
168169

169170
private final DeviceAdminUtil deviceAdminUtil;
171+
private final AluminiumDeviceHelper aluminiumDeviceHelper;
170172

171173
protected AndroidRealDeviceDelegate(
172174
AndroidDevice device,
@@ -217,6 +219,7 @@ protected AndroidRealDeviceDelegate(
217219
this.fileUtil = fileUtil;
218220
this.deviceAdminUtil = deviceAdminUtil;
219221
this.mtaasToolsInstantiator = mtaasToolsInstantiator;
222+
this.aluminiumDeviceHelper = new AluminiumDeviceHelper();
220223

221224
this.deviceId = device.getDeviceId();
222225
device.setProperty(
@@ -248,6 +251,20 @@ public void setUp() throws MobileHarnessException, InterruptedException {
248251
"Device is undetectable. Please replug the usb cable or reboot the device.");
249252
}
250253
}
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+
}
251268

252269
device.updateDimension(Dimension.Name.SUPPORTS_GMSCORE, Dimension.Value.TRUE);
253270
extrasInSetUp();
@@ -1019,6 +1036,20 @@ boolean checkOnlineModeDevice() throws MobileHarnessException, InterruptedExcept
10191036
enforceSafeDischargeLevelIfNeeded();
10201037

10211038
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+
}
10221053

10231054
return isDimensionChanged;
10241055
}

src/java/com/google/devtools/deviceinfra/ext/devicemanagement/device/platform/android/realdevice/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ java_library(
2727
],
2828
deps = [
2929
":android_real_device_constants",
30+
"//java/com/google/devtools/mobileharness/platform/aluminium/device:aluminium_device_helper",
3031
"//src/devtools/common/metrics/stability/model/proto:error_java_proto",
3132
"//src/devtools/mobileharness/api/deviceconfig/proto:basic_java_proto",
3233
"//src/devtools/mobileharness/api/model/proto:device_java_proto",

0 commit comments

Comments
 (0)