| commit | 362a213a93b67f47c298f418f17952dd1f231687 | [log] [tgz] |
|---|---|---|
| author | Ashish Kumar Gaurav <akgaurav@google.com> | Tue Jun 13 14:56:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 13 14:56:17 2023 +0000 |
| tree | 1564bdcbdc6b5cb0a441bddfd6234bcaac3eda3a | |
| parent | d2851521e3fff5837837c12d6084865a48fd8dc1 [diff] | |
| parent | e26cfeee4bc95275aa1a6d5207bcba98d8a4fe83 [diff] |
Merge "Fixed leak of cross user data in multiple settings." into sc-dev am: 23cfbb23d8 am: 6b60c92f38 am: 03107dda06 am: e26cfeee4b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/23528263 Change-Id: Ib96af2a2b244ad25374b1900ea24217909848215 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; }