From 81606e6793268e8909ef43f6a8a73f1b6010dc20 Mon Sep 17 00:00:00 2001 From: Yan Yan Date: Thu, 19 Sep 2024 10:30:21 -0700 Subject: VCN: Remove hidden APIs for data directory and Settings constants This patch removes following hidden API usages for mainling VCN: - Environment#getDataSystemDirectory() - Settings.Global.MOBILE_DATA Bug: 288465472 Test: atest FrameworksVcnTest && atest CtsVcnTestCases Flag: EXEMPT pure refactoring Change-Id: I66a605c4f460d456ac4349ffb67ecd5e7acc7438 --- services/core/java/com/android/server/VcnManagementService.java | 3 ++- services/core/java/com/android/server/vcn/Vcn.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index e2b6bd6ae360..c3d703341a94 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -178,9 +178,10 @@ public class VcnManagementService extends IVcnManagementService.Stub { public static final boolean VDBG = false; // STOPSHIP: if true + // The system path is copied from Environment.getDataSystemDirectory @VisibleForTesting(visibility = Visibility.PRIVATE) static final String VCN_CONFIG_FILE = - new File(Environment.getDataSystemDirectory(), "vcn/configs.xml").getPath(); + new File(Environment.getDataDirectory(), "system/vcn/configs.xml").getPath(); // TODO(b/176956496): Directly use CarrierServiceBindHelper.UNBIND_DELAY_MILLIS @VisibleForTesting(visibility = Visibility.PRIVATE) diff --git a/services/core/java/com/android/server/vcn/Vcn.java b/services/core/java/com/android/server/vcn/Vcn.java index 5a5f7ef7b225..5bc2c2dface9 100644 --- a/services/core/java/com/android/server/vcn/Vcn.java +++ b/services/core/java/com/android/server/vcn/Vcn.java @@ -86,6 +86,9 @@ public class Vcn extends Handler { private static final int MSG_EVENT_BASE = 0; private static final int MSG_CMD_BASE = 100; + // Copied from Settings.Global.MOBILE_DATA + private static final String SETTINGS_GLOBAL_MOBILE_DATA_STRING = "mobile_data"; + /** * A carrier app updated the configuration. * @@ -219,7 +222,8 @@ public class Vcn extends Handler { mContentResolver = mDeps.newVcnContentResolver(mVcnContext); mMobileDataSettingsObserver = new VcnMobileDataContentObserver(this /* handler */); - final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA); + // TODO: b/364740845: Replace it with DataEnabledListener + final Uri uri = Settings.Global.getUriFor(SETTINGS_GLOBAL_MOBILE_DATA_STRING); mContentResolver.registerContentObserver( uri, true /* notifyForDescendants */, mMobileDataSettingsObserver); -- cgit v1.2.3-59-g8ed1b