| commit | bab2b2ca3c5ad29b07a57698dfae47ab314cc482 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Aug 08 14:17:54 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 08 14:17:54 2022 +0000 |
| tree | ad27d37e72997426303e0fa98340e395e6dcfbbe | |
| parent | 1d2d8d30814f68998d1e4f40b9611054ad89bcc7 [diff] | |
| parent | e5fd09c19f4495dfc13be349c790f324d2686f48 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e5fd09c19f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/19551972 Change-Id: I22266f5c098d0029a97776df7bc44f88cf878925 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; }