Commit eb2116bd authored Oct 17, 2019 by Matt Pape

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

parent 97e162d6

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -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(