| commit | f9f9eee6d77e180185f6cab71b55c54d0af38290 | [log] [tgz] |
|---|---|---|
| author | Marcus Hagerott <mhagerott@google.com> | Wed Apr 07 16:37:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 07 16:37:12 2021 +0000 |
| tree | c77e17201ce59c5c145ff342eae76b54f849f7e1 | |
| parent | d846a8ead96f43b9ff6bf94d2f691829b1c34902 [diff] | |
| parent | 23d8931da9b6b04cedadf8693956917ff4dcc0ff [diff] |
Merge "Renaming PATH_SEGMENT constants in SimPhonebookProvider" am: b1d0a4efb0 am: 23d8931da9 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1649589 Change-Id: I9f9e634f4a033055e1232e529ae476fa70a905a1
diff --git a/src/com/android/phone/SimPhonebookProvider.java b/src/com/android/phone/SimPhonebookProvider.java index 6a27130..4a15950 100644 --- a/src/com/android/phone/SimPhonebookProvider.java +++ b/src/com/android/phone/SimPhonebookProvider.java
@@ -818,15 +818,15 @@ int efid; if (efName != null) { switch (efName) { - case ElementaryFiles.EF_ADN_PATH_SEGMENT: + case ElementaryFiles.PATH_SEGMENT_EF_ADN: efType = ElementaryFiles.EF_ADN; efid = IccConstants.EF_ADN; break; - case ElementaryFiles.EF_FDN_PATH_SEGMENT: + case ElementaryFiles.PATH_SEGMENT_EF_FDN: efType = ElementaryFiles.EF_FDN; efid = IccConstants.EF_FDN; break; - case ElementaryFiles.EF_SDN_PATH_SEGMENT: + case ElementaryFiles.PATH_SEGMENT_EF_SDN: efType = ElementaryFiles.EF_SDN; efid = IccConstants.EF_SDN; break;