diff options
| author | Brad Ebinger <breadley@google.com> | 2019-04-25 10:59:08 -0700 |
|---|---|---|
| committer | Brad Ebinger <breadley@google.com> | 2019-05-06 22:02:15 +0000 |
| commit | e7704769a576b941e9ce3c08cc717966c425a02a (patch) | |
| tree | 35a4790059d97f0981e9e1c8ec1613320cb4899d | |
| parent | 7050ce9434976a2fb762847e3ae4d287f2c03899 (diff) | |
| download | base-e7704769a576b941e9ce3c08cc717966c425a02a.tar.gz | |
Rollback SHELL UID check for CarrierConfigLoader
When a test calls adoptShellPermissionIdentity before
calling a command, it doesn't adopt the shell UID, only
the permissions. So, we can not use
Binder#getCallingIdentity to determine it the API is
being called as part of a test. For now, we must only
use MODIFY_PHONE_STATE until a better pattern is
established.
Test: Manual
Bug: 131185660
Merged-In: I607b7c9afe1c384a41ce12b92ae43747b2ee1bc3
Change-Id: I59d32a2e36950b2485e1a46a25e3724928676219
| -rwxr-xr-x | telephony/java/android/telephony/CarrierConfigManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index c32e164954e3..c449dbf02c2e 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3159,8 +3159,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 |