Merge "Rollback SHELL UID check for CarrierConfigLoader" into qt-dev

am: 8f532eb216

Change-Id: I607b7c9afe1c384a41ce12b92ae43747b2ee1bc3
This commit is contained in:
Brad Ebinger
2019-04-30 15:17:39 -07:00
committed by android-build-merger

View File

@@ -3371,8 +3371,7 @@ public class CarrierConfigManager {
* May throw an {@link IllegalArgumentException} if {@code overrideValues} contains invalid
* values for the specified config keys.
*
* NOTE: This API is meant for testing purposes only and may only be accessed from the shell UID
* during instrumentation testing.
* NOTE: This API is meant for testing purposes only.
*
* @param subscriptionId The subscription ID for which the override should be done.
* @param overrideValues Key-value pairs of the values that are to be overridden. If set to