summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/provider/Settings.java16
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java5
2 files changed, 0 insertions, 21 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 2f86efec7086..e5169562f076 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3445,7 +3445,6 @@ public final class Settings {
public ArrayMap<String, String> getStringsForPrefix(ContentResolver cr, String prefix,
List<String> names) {
String namespace = prefix.substring(0, prefix.length() - 1);
- Config.enforceReadPermission(namespace);
ArrayMap<String, String> keyValues = new ArrayMap<>();
int currentGeneration = -1;
boolean needsGenerationTracker = false;
@@ -19288,21 +19287,6 @@ public final class Settings {
.getApplicationContext().checkCallingOrSelfPermission(permission);
}
- /**
- * Enforces READ_DEVICE_CONFIG permission if namespace is not one of public namespaces.
- * @hide
- */
- public static void enforceReadPermission(String namespace) {
- if (ActivityThread.currentApplication().getApplicationContext()
- .checkCallingOrSelfPermission(Manifest.permission.READ_DEVICE_CONFIG)
- != PackageManager.PERMISSION_GRANTED) {
- if (!DeviceConfig.getPublicNamespaces().contains(namespace)) {
- throw new SecurityException("Permission denial: reading from settings requires:"
- + Manifest.permission.READ_DEVICE_CONFIG);
- }
- }
- }
-
private static void setMonitorCallbackAsUser(
@NonNull @CallbackExecutor Executor executor,
@NonNull ContentResolver resolver, @UserIdInt int userHandle,
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 215a040c6a72..3299a37d90da 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1149,8 +1149,6 @@ public class SettingsProvider extends ContentProvider {
Slog.v(LOG_TAG, "getConfigSetting(" + name + ")");
}
- Settings.Config.enforceReadPermission(/*namespace=*/name.split("/")[0]);
-
// Get the value.
synchronized (mLock) {
return mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_CONFIG,
@@ -1330,9 +1328,6 @@ public class SettingsProvider extends ContentProvider {
Slog.v(LOG_TAG, "getAllConfigFlags() for " + prefix);
}
- Settings.Config.enforceReadPermission(
- prefix != null ? prefix.split("/")[0] : null);
-
synchronized (mLock) {
// Get the settings.
SettingsState settingsState = mSettingsRegistry.getSettingsLocked(