Merge change 5234

* changes:
  Adds precedence information to the CommonDataKinds.Im class.

1 files changed, 15 insertions, 0 deletions

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 1ed0574046e4..b8504f8cba15 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -16,6 +16,9 @@
 
 package android.provider;
 
+import java.util.Arrays;
+import java.util.List;
+
 import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -521,6 +524,18 @@ public final class ContactsContract {
         }
 
         /**
+         * Returns the precedence of the status code the higher number being the higher precedence.
+         *
+         * @param status The status code.
+         * @return An integer representing the precedence, 0 being the lowest.
+         */
+        public static final int getPresencePrecedence(int status) {
+            // Keep this function here incase we want to enforce a different precedence than the
+            // natural order of the status constants.
+            return status;
+        }
+
+        /**
          * The MIME type of {@link #CONTENT_URI} providing a directory of
          * presence details.
          */