Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Iba48c173,If0a71607 into rvc-dev am: f416c7f9cd

Browse Source 
Change-Id: I165a74184e8eefa83e5c1d8f2ebd22be33c8e234
This commit is contained in:
Automerger Merge Worker
2020-02-26 05:20:59 +00:00
parent 056e3f07e1 f416c7f9cd
commit f2277f87fd
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java
View File

@@ -47,7 +47,7 @@ public class BootImageProfileTest implements IDeviceTest {
return mTestDevice.getProperty("persist.device_config.runtime_native_boot."
+ property);
} else {
return mTestDevice.getProperty("dalvik.vm." + property);
return mTestDevice.executeShellCommand("getprop dalvik.vm." + property).trim();
}
}
@@ -66,9 +66,9 @@ public class BootImageProfileTest implements IDeviceTest {
*/
public void validateProperties() throws Exception {
String res = getProperty("profilebootclasspath");
assertTrue("profile boot class path not enabled", res != null && res.equals("true"));
assertTrue("profile boot class path not enabled: " + res, "true".equals(res));
res = getProperty("profilesystemserver");
assertTrue("profile system server not enabled", res != null && res.equals("true"));
assertTrue("profile system server not enabled: " + res, "true".equals(res));
}
private boolean forceSaveProfile(String pkg) throws Exception {
@@ -88,20 +88,20 @@ public class BootImageProfileTest implements IDeviceTest {
String res;
// Set properties and wait for them to be readable.
for (int i = 1; i <= numIterations; ++i) {
res = getProperty("profilebootclasspath");
boolean profileBootClassPath = res != null && res.equals("true");
res = getProperty("profilesystemserver");
boolean profileSystemServer = res != null && res.equals("true");
String pbcp = getProperty("profilebootclasspath");
boolean profileBootClassPath = "true".equals(pbcp);
String pss = getProperty("profilesystemserver");
boolean profileSystemServer = "true".equals(pss);
if (profileBootClassPath && profileSystemServer) {
break;
}
if (i == numIterations) {
assertTrue("profile system server not enabled", profileSystemServer);
assertTrue("profile boot class path not enabled", profileSystemServer);
assertTrue("profile system server not enabled: " + pss, profileSystemServer);
assertTrue("profile boot class path not enabled: " + pbcp, profileBootClassPath);
}
res = setProperty("profilebootclasspath", "true");
res = setProperty("profilesystemserver", "true");
setProperty("profilebootclasspath", "true");
setProperty("profilesystemserver", "true");
Thread.sleep(1000);
}
@@ -111,16 +111,16 @@ public class BootImageProfileTest implements IDeviceTest {
res = mTestDevice.executeShellCommand("start");
assertTrue("start shell: " + res, res.length() == 0);
for (int i = 1; i <= numIterations; ++i) {
res = getProperty("profilebootclasspath");
boolean profileBootClassPath = res != null && res.equals("true");
res = getProperty("profilesystemserver");
boolean profileSystemServer = res != null && res.equals("true");
String pbcp = getProperty("profilebootclasspath");
boolean profileBootClassPath = "true".equals(pbcp);
String pss = getProperty("profilesystemserver");
boolean profileSystemServer = "true".equals(pss);
if (profileBootClassPath && profileSystemServer) {
break;
}
if (i == numIterations) {
assertTrue("profile system server not enabled", profileSystemServer);
assertTrue("profile boot class path not enabled", profileSystemServer);
assertTrue("profile system server not enabled: " + pss, profileSystemServer);
assertTrue("profile boot class path not enabled: " + pbcp, profileBootClassPath);
}
Thread.sleep(1000);
}