pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate Vendor Overlay when VNDK is deprecated 

Vendor overlay was introduced to enable system-only update with small
changes on the vendor, but this is no longer required with same reason
of VNDK deprecation - more frequent Vendor update than expected, and
makes system-vendor interface unstable. This change adds more comments
to explain that Vendor overlay will be deprecated along with VNDK, and
skip test if VNDK is deprecated.

Bug: 307925435
Bug: 307902290
Test: fs_mgr_vendor_overlay_test passed with CF trunk-staging device
Change-Id: I7b9359a5754e8740e749c48f6265a1b0f92f13af
This commit is contained in:
Kiyoung Kim 2023-10-26 22:54:31 +09:00
parent 3f214d7a09
commit 260e48f07e
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. // properties are loaded.
static const auto vndk_version = android::base::GetProperty(kVndkVersionPropertyName, ""); static const auto vndk_version = android::base::GetProperty(kVndkVersionPropertyName, "");
if (vndk_version.empty()) { if (vndk_version.empty()) {
// Vendor overlay is disabled from VNDK deprecated devices.
LINFO << "vendor overlay: vndk version not defined"; LINFO << "vendor overlay: vndk version not defined";
return false; 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.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.util.CommandResult; import com.android.tradefed.util.CommandResult;
import com.android.tradefed.util.CommandStatus; import com.android.tradefed.util.CommandStatus;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.junit.After; import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Assume; import org.junit.Assume;
@ -38,9 +36,15 @@ import org.junit.runner.RunWith;
@RunWith(DeviceJUnit4ClassRunner.class) @RunWith(DeviceJUnit4ClassRunner.class)
public class VendorOverlayHostTest extends BaseHostJUnit4Test { public class VendorOverlayHostTest extends BaseHostJUnit4Test {
boolean wasRoot = false; boolean wasRoot = false;
String vndkVersion = null;
@Before @Before
public void setup() throws DeviceNotAvailableException { 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(); wasRoot = getDevice().isAdbRoot();
if (!wasRoot) { if (!wasRoot) {
Assume.assumeTrue("Test requires root", getDevice().enableAdbRoot()); Assume.assumeTrue("Test requires root", getDevice().enableAdbRoot());
@ -74,8 +78,6 @@ public class VendorOverlayHostTest extends BaseHostJUnit4Test {
*/ */
@Test @Test
public void testVendorOverlay() throws DeviceNotAvailableException { public void testVendorOverlay() throws DeviceNotAvailableException {
String vndkVersion = getDevice().executeShellV2Command("getprop ro.vndk.version").getStdout();
// Create files and modify policy // Create files and modify policy
CommandResult result = getDevice().executeShellV2Command( CommandResult result = getDevice().executeShellV2Command(
"echo '/(product|system/product)/vendor_overlay/" + vndkVersion + "echo '/(product|system/product)/vendor_overlay/" + vndkVersion +