Merge "Rollback SHELL UID check for CarrierConfigLoader"

am: bdb61f3cf2

Change-Id: Idd55627f0e81b99d56c2a2d8fffa1d04a49ad76f
This commit is contained in:
Brad Ebinger
2019-05-06 16:09:55 -07:00
committed by android-build-merger

View File

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