From eb2116bd30a5c8ce2f120f3ccd341ce42009b392 Mon Sep 17 00:00:00 2001 From: Matt Pape Date: Thu, 17 Oct 2019 15:20:34 -0700 Subject: CP ag/9571636 from master to qt-qpr1-dev Bug: 143299398 -------------------------------------------------------------- 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 --- .../src/com/android/providers/settings/SettingsProvider.java | 3 +++ 1 file changed, 3 insertions(+) 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( -- cgit v1.2.3-59-g8ed1b