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

CP ag/9571636 from master to qt-qpr1-dev

Browse Source 
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
This commit is contained in:
Matt Pape
2019-10-17 15:20:34 -07:00
parent 97e162d605
commit eb2116bd30
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);
}
DeviceConfig.enforceReadPermission(getContext(),
prefix != null ? prefix.split("/")[0] : null);
synchronized (mLock) {
// Get the settings.
SettingsState settingsState = mSettingsRegistry.getSettingsLocked(