- hide Entity and all its references

- remove updateEntity and insertEntity, since they are not
  used
- add the RawContacts.Entity class, which is used in lieu of the
  android.content.Entity

1 files changed, 7 insertions, 19 deletions

diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 5b29b97..a341c9b 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -131,6 +131,9 @@ public abstract class ContentProvider implements ComponentCallbacks {
                     selectionArgs, sortOrder);
         }
 
+        /**
+         * @hide
+         */
         public EntityIterator queryEntities(Uri uri, String selection, String[] selectionArgs,
                 String sortOrder) {
             enforceReadPermission(uri);
@@ -152,11 +155,6 @@ public abstract class ContentProvider implements ComponentCallbacks {
             return ContentProvider.this.bulkInsert(uri, initialValues);
         }
 
-        public Uri insertEntity(Uri uri, Entity entities) {
-            enforceWritePermission(uri);
-            return ContentProvider.this.insertEntity(uri, entities);
-        }
-
         public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)
                 throws OperationApplicationException {
             for (ContentProviderOperation operation : operations) {
@@ -182,11 +180,6 @@ public abstract class ContentProvider implements ComponentCallbacks {
             return ContentProvider.this.update(uri, values, selection, selectionArgs);
         }
 
-        public int updateEntity(Uri uri, Entity entity) {
-            enforceWritePermission(uri);
-            return ContentProvider.this.updateEntity(uri, entity);
-        }
-
         public ParcelFileDescriptor openFile(Uri uri, String mode)
                 throws FileNotFoundException {
             if (mode != null && mode.startsWith("rw")) enforceWritePermission(uri);
@@ -451,6 +444,9 @@ public abstract class ContentProvider implements ComponentCallbacks {
     public abstract Cursor query(Uri uri, String[] projection,
             String selection, String[] selectionArgs, String sortOrder);
 
+    /**
+     * @hide
+     */
     public EntityIterator queryEntities(Uri uri, String selection, String[] selectionArgs,
             String sortOrder) {
         throw new UnsupportedOperationException();
@@ -506,10 +502,6 @@ public abstract class ContentProvider implements ComponentCallbacks {
         return numValues;
     }
 
-    public Uri insertEntity(Uri uri, Entity entity) {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * A request to delete one or more rows. The selection clause is applied when performing
      * the deletion, allowing the operation to affect multiple rows in a
@@ -554,14 +546,10 @@ public abstract class ContentProvider implements ComponentCallbacks {
     public abstract int update(Uri uri, ContentValues values, String selection,
             String[] selectionArgs);
 
-    public int updateEntity(Uri uri, Entity entity) {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Open a file blob associated with a content URI.
      * This method can be called from multiple
-     * threads, as described in
+     * threads, as described inentity
      * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
      * Processes and Threads</a>.
      *