| commit | fced41298f4c625f188c9ef2fda21f87143f9679 | [log] [tgz] |
|---|---|---|
| author | Ashish Kumar Gaurav <akgaurav@google.com> | Tue Jun 13 16:41:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 13 16:41:55 2023 +0000 |
| tree | 1564bdcbdc6b5cb0a441bddfd6234bcaac3eda3a | |
| parent | 1763fdeffbc3c226a433595596bcd4cd8ede3e16 [diff] | |
| parent | 0327a28c7bbc0743d6cc42ce5fe29762343ca76f [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Fixed leak of cross user data in multiple settings." into rvc-dev am: 990b6c6625 am: 1b01a94954 -s ours am: db45fd3600 -s ours am: d330d9180f -s ours am: 88ecafce69 -s ours am: 0327a28c7b -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: If919db71543ab687e326a961e09f2bb95050169f 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; }