Merge "CP ag/9571636 from master to qt-qpr1-dev Bug: 143299398" into qt-qpr1-dev

2020-03-20 23:11:28 +00:00
parent 491fbcaeaf eb2116bd30
commit 923adf473d
1 changed files with 3 additions and 0 deletions
--- 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(