diff options
| author | 2019-10-17 15:20:34 -0700 | |
|---|---|---|
| committer | 2019-10-29 07:43:11 -0700 | |
| commit | 91beb9c1c452f354785e11470b68926668a3d1bd (patch) | |
| tree | 27dc98b540cfd7a94538f55f23e2ba01c92468e3 | |
| parent | 78cf27e7b605a681199327f4165318846636e588 (diff) | |
Enforce READ_DEVICE_CONFIG in DeviceConfig.getProperties path.
Test: atest CtsDeviceConfigTestCases
atest FrameworksCoreTests:DeviceConfigTest
atest FrameworksCoreTests:SettingsProviderTest
atest SettingsProviderTest:DeviceConfigServiceTest
Bug: 142891501
Change-Id: Ic01632514862b640d9e3b280b1ac15b1391c3c17
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 3 |
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 80faf4766e36..fdc987fb0919 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1080,6 +1080,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( |