summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brad Ebinger <breadley@google.com> 2019-04-29 22:59:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-29 22:59:48 +0000
commit8f532eb216b94d35a5689147c8ef5174fdeb51b6 (patch)
tree0143ccb8db4977f57b9147d3cd5f6d7fda19aaee
parent7fe96e5ea66497334c2d62384b7d0e50b73386a7 (diff)
parentcf297467e062734ba19c02bdd879d6dd14769677 (diff)
Merge "Rollback SHELL UID check for CarrierConfigLoader" into qt-dev
-rwxr-xr-xtelephony/java/android/telephony/CarrierConfigManager.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 2d8a280873f6..638733430ede 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -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