From 9eb214161a62ad78f39758009b4cbf6aa9ce8281 Mon Sep 17 00:00:00 2001 From: Benedict Wong Date: Wed, 13 Apr 2022 22:32:23 +0000 Subject: [PATCH] Update the constants to use Environment This change updates the file storage constants to use the Environment system data paths instead of redefined constants. Bug: 215406468 Test: atest FrameworksVcnTests Change-Id: If11c600601704b78527c3c1b48cc908e75f3d791 --- .../core/java/com/android/server/VcnManagementService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index eefeee3918b31..f26d9f9f49e62 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -52,6 +52,7 @@ import android.net.vcn.VcnManager.VcnStatusCode; import android.net.vcn.VcnUnderlyingNetworkPolicy; import android.net.wifi.WifiInfo; import android.os.Binder; +import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -82,6 +83,7 @@ import com.android.server.vcn.VcnContext; import com.android.server.vcn.VcnNetworkProvider; import com.android.server.vcn.util.PersistableBundleUtils; +import java.io.File; import java.io.FileDescriptor; import java.io.IOException; import java.io.PrintWriter; @@ -162,7 +164,8 @@ public class VcnManagementService extends IVcnManagementService.Stub { public static final boolean VDBG = false; // STOPSHIP: if true @VisibleForTesting(visibility = Visibility.PRIVATE) - static final String VCN_CONFIG_FILE = "/data/system/vcn/configs.xml"; + static final String VCN_CONFIG_FILE = + new File(Environment.getDataSystemDirectory(), "vcn/configs.xml").getPath(); /* Binder context for this service */ @NonNull private final Context mContext;