diff --git a/framework/src/android/net/ConnectivitySettingsManager.java b/framework/src/android/net/ConnectivitySettingsManager.java index 5f7f539d0a..03c3600414 100644 --- a/framework/src/android/net/ConnectivitySettingsManager.java +++ b/framework/src/android/net/ConnectivitySettingsManager.java @@ -1070,7 +1070,7 @@ public class ConnectivitySettingsManager { */ @NonNull public static Set getUidsAllowedOnRestrictedNetworks(@NonNull Context context) { - final String uidList = Settings.Secure.getString( + final String uidList = Settings.Global.getString( context.getContentResolver(), UIDS_ALLOWED_ON_RESTRICTED_NETWORKS); return getUidSetFromString(uidList); } @@ -1084,7 +1084,7 @@ public class ConnectivitySettingsManager { public static void setUidsAllowedOnRestrictedNetworks(@NonNull Context context, @NonNull Set uidList) { final String uids = getUidStringFromSet(uidList); - Settings.Secure.putString(context.getContentResolver(), UIDS_ALLOWED_ON_RESTRICTED_NETWORKS, + Settings.Global.putString(context.getContentResolver(), UIDS_ALLOWED_ON_RESTRICTED_NETWORKS, uids); } } diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java index 90c56dfddc..332884660c 100644 --- a/service/src/com/android/server/connectivity/PermissionMonitor.java +++ b/service/src/com/android/server/connectivity/PermissionMonitor.java @@ -197,7 +197,7 @@ public class PermissionMonitor { // Register UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer mDeps.registerContentObserver( userAllContext, - Settings.Secure.getUriFor(UIDS_ALLOWED_ON_RESTRICTED_NETWORKS), + Settings.Global.getUriFor(UIDS_ALLOWED_ON_RESTRICTED_NETWORKS), false /* notifyForDescendants */, new ContentObserver(null) { @Override diff --git a/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java index ef6ed820d1..e98f5db564 100644 --- a/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -920,7 +920,7 @@ public class PermissionMonitorTest { public void testUidsAllowedOnRestrictedNetworksChanged() throws Exception { final NetdMonitor netdMonitor = new NetdMonitor(mNetdService); final ContentObserver contentObserver = expectRegisterContentObserver( - Settings.Secure.getUriFor(UIDS_ALLOWED_ON_RESTRICTED_NETWORKS)); + Settings.Global.getUriFor(UIDS_ALLOWED_ON_RESTRICTED_NETWORKS)); mPermissionMonitor.onUserAdded(MOCK_USER1); // Prepare PackageInfo for MOCK_PACKAGE1 and MOCK_PACKAGE2 @@ -954,7 +954,7 @@ public class PermissionMonitorTest { public void testUidsAllowedOnRestrictedNetworksChangedWithSharedUid() throws Exception { final NetdMonitor netdMonitor = new NetdMonitor(mNetdService); final ContentObserver contentObserver = expectRegisterContentObserver( - Settings.Secure.getUriFor(UIDS_ALLOWED_ON_RESTRICTED_NETWORKS)); + Settings.Global.getUriFor(UIDS_ALLOWED_ON_RESTRICTED_NETWORKS)); mPermissionMonitor.onUserAdded(MOCK_USER1); buildAndMockPackageInfoWithPermissions(MOCK_PACKAGE1, MOCK_UID1, CHANGE_NETWORK_STATE); @@ -988,7 +988,7 @@ public class PermissionMonitorTest { public void testUidsAllowedOnRestrictedNetworksChangedWithMultipleUsers() throws Exception { final NetdMonitor netdMonitor = new NetdMonitor(mNetdService); final ContentObserver contentObserver = expectRegisterContentObserver( - Settings.Secure.getUriFor(UIDS_ALLOWED_ON_RESTRICTED_NETWORKS)); + Settings.Global.getUriFor(UIDS_ALLOWED_ON_RESTRICTED_NETWORKS)); // One user MOCK_USER1 mPermissionMonitor.onUserAdded(MOCK_USER1);