Update FDN and SDN constants
These should mirror IccConstants usage for consistency.
Test: Manual build and flash
Bug: 170653527
Change-Id: I5ff335eeae99cd5b6f8ebfb809c826843d6abd77
diff --git a/core/api/current.txt b/core/api/current.txt
index f748c24..26e0109 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -38711,8 +38711,8 @@
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<android.provider.ContactsContract.SimAccount> 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 da06e82..b2b8db1 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -8368,10 +8368,10 @@
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}.