| commit | d2851521e3fff5837837c12d6084865a48fd8dc1 | [log] [tgz] |
|---|---|---|
| author | Aishwarya Mallampati <amallampati@google.com> | Tue Jun 06 23:20:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 06 23:20:00 2023 +0000 |
| tree | b9b52a247a4ce5a9896c068a59e110433504d5d6 | |
| parent | 184ffa74181263261279995dca096d669d383c5c [diff] | |
| parent | 4deb8082470e5bfe73cdde7364240616d0b4ba80 [diff] |
[automerger skipped] DO NOT MERGE Grant carrier privileges if package has carrier config access. am: 213aba7e18 am: 42ad104329 -s ours am: b64e63b2e7 -s ours am: 54e8348939 -s ours am: 8e20cf2cc6 -s ours am: 4deb808247 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/20315707 Change-Id: I8da97f2c049c87c5bf09e7daa158d52a497b43e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java index 669e830..97676fc 100644 --- a/src/com/android/phone/TelephonyShellCommand.java +++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -1646,7 +1646,7 @@ String tag = CARRIER_CONFIG_SUBCOMMAND + " " + CC_SET_VALUES_FROM_XML + ": "; // Parse all options - CcOptionParseResult options = parseCcOptions(tag, false); + CcOptionParseResult options = parseCcOptions(tag, true); if (options == null) { return -1; }