| commit | 8bacf179c757fc5989a8a72a38e2d57091085937 | [log] [tgz] |
|---|---|---|
| author | Aishwarya Mallampati <amallampati@google.com> | Tue Jun 06 21:55:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 06 21:55:55 2023 +0000 |
| tree | b9b52a247a4ce5a9896c068a59e110433504d5d6 | |
| parent | dd83f29a3b3270859254ac961d41392248001c15 [diff] | |
| parent | d2b770d0dc56e6e4fb74ddcc90f4e12e0d32041c [diff] |
[automerger skipped] DO NOT MERGE Grant carrier privileges if package has carrier config access. am: 17f961e44e -s ours am: d2b770d0dc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/20317241 Change-Id: I6f44848f3bbd6417baec14da4af5937e8834bf6a 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; }