Skip to content

Commit b9c032b

Browse files
DeviceInfracopybara-github
DeviceInfra
authored andcommitted
Internal change
PiperOrigin-RevId: 753832573
1 parent bf2c642 commit b9c032b

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

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

Lines changed: 33 additions & 1 deletion
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,
@@ -192,7 +194,8 @@ protected AndroidRealDeviceDelegate(
192194
Fastboot fastboot,
193195
LocalFileUtil fileUtil,
194196
DeviceAdminUtil deviceAdminUtil,
195-
MtaasToolsInstantiator mtaasToolsInstantiator) {
197+
MtaasToolsInstantiator mtaasToolsInstantiator,
198+
AluminiumDeviceHelper aluminiumDeviceHelper) {
196199
this.device = device;
197200
this.androidDeviceDelegate = androidDeviceDelegate;
198201
this.deviceStat = deviceStat;
@@ -217,6 +220,7 @@ protected AndroidRealDeviceDelegate(
217220
this.fileUtil = fileUtil;
218221
this.deviceAdminUtil = deviceAdminUtil;
219222
this.mtaasToolsInstantiator = mtaasToolsInstantiator;
223+
this.aluminiumDeviceHelper = new AluminiumDeviceHelper();
220224

221225
this.deviceId = device.getDeviceId();
222226
device.setProperty(
@@ -248,6 +252,20 @@ public void setUp() throws MobileHarnessException, InterruptedException {
248252
"Device is undetectable. Please replug the usb cable or reboot the device.");
249253
}
250254
}
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+
}
251269

252270
device.updateDimension(Dimension.Name.SUPPORTS_GMSCORE, Dimension.Value.TRUE);
253271
extrasInSetUp();
@@ -1019,6 +1037,20 @@ boolean checkOnlineModeDevice() throws MobileHarnessException, InterruptedExcept
10191037
enforceSafeDischargeLevelIfNeeded();
10201038

10211039
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+
}
10221054

10231055
return isDimensionChanged;
10241056
}

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)