summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Pape <mpape@google.com> 2020-03-20 23:11:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-03-20 23:11:28 +0000
commit923adf473d2fb15ca757feb1a8fc6bbb4fe37778 (patch)
tree23a2b50501fef0369345af1f780896f5080cf8e2
parent491fbcaeafba07a76e9e056e4679fcf193376343 (diff)
parenteb2116bd30a5c8ce2f120f3ccd341ce42009b392 (diff)
Merge "CP ag/9571636 from master to qt-qpr1-dev Bug: 143299398" into qt-qpr1-dev
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index fbfbe7fc1d9b..210aff717b7c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1136,6 +1136,9 @@ public class SettingsProvider extends ContentProvider {
Slog.v(LOG_TAG, "getAllConfigFlags() for " + prefix);
}
+ DeviceConfig.enforceReadPermission(getContext(),
+ prefix != null ? prefix.split("/")[0] : null);
+
synchronized (mLock) {
// Get the settings.
SettingsState settingsState = mSettingsRegistry.getSettingsLocked(