commit | 91beb9c1c452f354785e11470b68926668a3d1bd | [log] [tgz] |
---|---|---|
author | Matt Pape <mpape@google.com> | Thu Oct 17 15:20:34 2019 -0700 |
committer | Matt Pape <mpape@google.com> | Tue Oct 29 07:43:11 2019 -0700 |
tree | 27dc98b540cfd7a94538f55f23e2ba01c92468e3 | |
parent | 78cf27e7b605a681199327f4165318846636e588 [diff] [blame] |
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
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 80faf476..fdc987f 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 @@ 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(