summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Gary Mai <garymai@google.com> 2020-12-15 14:27:31 -0800
committer Gary Mai <garymai@google.com> 2020-12-15 15:16:36 -0800
commitfc652f2457ef3b78bd26c698927209504fe41ae2 (patch)
treebf7c9bbe7f568436dc4e92f5f03d7ce2185e52d3
parentcb3b982b99117529afccfbdf123fe7a235f7921b (diff)
Update FDN and SDN constants
These should mirror IccConstants usage for consistency. Test: Manual build and flash Bug: 170653527 Change-Id: I5ff335eeae99cd5b6f8ebfb809c826843d6abd77
-rw-r--r--core/api/current.txt4
-rw-r--r--core/java/android/provider/ContactsContract.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index f748c24e9181..26e0109ec1a8 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<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 da06e821ea9f..b2b8db19ac17 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}.