tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Deprecate Vendor Overlay when VNDK is deprecated" into main

Browse source
This commit is contained in:
Kiyoung Kim 2023-10-30 05:12:37 +00:00 committed by Gerrit Code Review
commit dfe80e48f9
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs_mgr/fs_mgr_vendor_overlay.cpp
View file

@ -112,6 +112,7 @@ bool fs_mgr_vendor_overlay_mount_all() {
// properties are loaded.
static const auto vndk_version = android::base::GetProperty(kVndkVersionPropertyName, "");
if (vndk_version.empty()) {
// Vendor overlay is disabled from VNDK deprecated devices.
LINFO << "vendor overlay: vndk version not defined";
return false;
}

10
fs_mgr/tests/src/com/android/tests/vendoroverlay/VendorOverlayHostTest.java
View file

@ -21,10 +21,8 @@ import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.util.CommandResult;
import com.android.tradefed.util.CommandStatus;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.junit.After;
import org.junit.Assert;
import org.junit.Assume;
@ -38,9 +36,15 @@ import org.junit.runner.RunWith;
@RunWith(DeviceJUnit4ClassRunner.class)
public class VendorOverlayHostTest extends BaseHostJUnit4Test {
boolean wasRoot = false;
String vndkVersion = null;
@Before
public void setup() throws DeviceNotAvailableException {
vndkVersion = getDevice().executeShellV2Command("getprop ro.vndk.version").getStdout();
Assume.assumeTrue(
"Vendor Overlay is disabled for VNDK deprecated devices",
vndkVersion != null && !vndkVersion.trim().isEmpty());
wasRoot = getDevice().isAdbRoot();
if (!wasRoot) {
Assume.assumeTrue("Test requires root", getDevice().enableAdbRoot());
@ -74,8 +78,6 @@ public class VendorOverlayHostTest extends BaseHostJUnit4Test {
*/
@Test
public void testVendorOverlay() throws DeviceNotAvailableException {
String vndkVersion = getDevice().executeShellV2Command("getprop ro.vndk.version").getStdout();
// Create files and modify policy
CommandResult result = getDevice().executeShellV2Command(
"echo '/(product|system/product)/vendor_overlay/" + vndkVersion +