| commit | 1763fdeffbc3c226a433595596bcd4cd8ede3e16 | [log] [tgz] |
|---|---|---|
| author | Ashish Kumar <akgaurav@google.com> | Tue Jun 13 16:41:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 13 16:41:53 2023 +0000 |
| tree | 1564bdcbdc6b5cb0a441bddfd6234bcaac3eda3a | |
| parent | 362a213a93b67f47c298f418f17952dd1f231687 [diff] | |
| parent | c3cf0094c5dbc8f51675ecb6f640526a3db307f2 [diff] |
[automerger skipped] RESTRICT AUTOMERGE am: 36e10a6d0d am: 166d31fe90 -s ours am: 650eed99b6 -s ours am: 2ae05ef107 -s ours am: 7a5d6ea498 -s ours am: c3cf0094c5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/23515301 Change-Id: I07a2c36d0847abc0b9595ae136c438ddaf3be8cb 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; }