Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22979719 authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Update the constants to use Environment" am: 99e23bcc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2064568



Change-Id: I037d7a3d66297e5606ff74033f42a841591ce84a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62afa55b 99e23bcc

services/core/java/com/android/server/VcnManagementService.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ import android.net.vcn.VcnManager.VcnStatusCode; 
import android.net.vcn.VcnUnderlyingNetworkPolicy;

import android.net.vcn.VcnUnderlyingNetworkPolicy;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiInfo;

import android.os.Binder;

import android.os.Binder;

import android.os.Environment;

import android.os.Handler;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.HandlerThread;

import android.os.IBinder;

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.VcnNetworkProvider;

import com.android.server.vcn.util.PersistableBundleUtils;

import com.android.server.vcn.util.PersistableBundleUtils;





import java.io.File;

import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.IOException;

import java.io.IOException;

import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -162,7 +164,8 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
    public static final boolean VDBG = false; // STOPSHIP: if true

    public static final boolean VDBG = false; // STOPSHIP: if true





    @VisibleForTesting(visibility = Visibility.PRIVATE)

    @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 */

    /* Binder context for this service */

    @NonNull private final Context mContext;

    @NonNull private final Context mContext;