From fc652f2457ef3b78bd26c698927209504fe41ae2 Mon Sep 17 00:00:00 2001 From: Gary Mai Date: Tue, 15 Dec 2020 14:27:31 -0800 Subject: [PATCH] Update FDN and SDN constants These should mirror IccConstants usage for consistency. Test: Manual build and flash Bug: 170653527 Change-Id: I5ff335eeae99cd5b6f8ebfb809c826843d6abd77 --- core/api/current.txt | 4 ++-- core/java/android/provider/ContactsContract.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index f748c24e91818..26e0109ec1a81 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -38711,8 +38711,8 @@ package android.provider { method public void writeToParcel(@NonNull android.os.Parcel, int); field public static final int ADN_EF_TYPE = 1; // 0x1 field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int FDN_EF_TYPE = 3; // 0x3 - field public static final int SDN_EF_TYPE = 2; // 0x2 + field public static final int FDN_EF_TYPE = 2; // 0x2 + field public static final int SDN_EF_TYPE = 3; // 0x3 field public static final int UNKNOWN_EF_TYPE = 0; // 0x0 } diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index da06e821ea9fe..b2b8db19ac170 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -8368,10 +8368,10 @@ public final class ContactsContract { public static final int UNKNOWN_EF_TYPE = 0; /** EF type identifier for the ADN partition. */ public static final int ADN_EF_TYPE = 1; - /** EF type identifier for the SDN partition. */ - public static final int SDN_EF_TYPE = 2; /** EF type identifier for the FDN partition. */ - public static final int FDN_EF_TYPE = 3; + public static final int FDN_EF_TYPE = 2; + /** EF type identifier for the SDN partition. */ + public static final int SDN_EF_TYPE = 3; /** * The account_name of this SIM account. See {@link RawContacts#ACCOUNT_NAME}.