Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Pape
2020-03-20 23:11:28 +00:00
committed by Android (Google) Code Review
parent 491fbcaeaf eb2116bd30
commit 923adf473d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -1136,6 +1136,9 @@ public class SettingsProvider extends ContentProvider {
Slog.v(LOG_TAG, "getAllConfigFlags() for " + prefix); Slog.v(LOG_TAG, "getAllConfigFlags() for " + prefix);
} }
DeviceConfig.enforceReadPermission(getContext(),
prefix != null ? prefix.split("/")[0] : null);
synchronized (mLock) { synchronized (mLock) {
// Get the settings. // Get the settings.
SettingsState settingsState = mSettingsRegistry.getSettingsLocked( SettingsState settingsState = mSettingsRegistry.getSettingsLocked(