Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bba632d authored by Fred Quintana's avatar Fred Quintana
Browse files

- 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
parent 5163cd6d

api/current.xml

+76 −417
Original line number Diff line number Diff line
@@ -27216,88 +27216,6 @@ 
</package>

<package name="android.content"

>

<class name="AbstractCursorEntityIterator"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.content.EntityIterator">

</implements>

<constructor name="AbstractCursorEntityIterator"

 type="android.content.AbstractCursorEntityIterator"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="db" type="android.database.sqlite.SQLiteDatabase">

</parameter>

<parameter name="entityCursor" type="android.database.Cursor">

</parameter>

</constructor>

<method name="close"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="hasNext"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="newEntityFromCursorLocked"

 return="android.content.Entity"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cursor" type="android.database.Cursor">

</parameter>

</method>

<method name="next"

 return="android.content.Entity"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="reset"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</class>

<class name="ActivityNotFoundException"

 extends="java.lang.RuntimeException"

 abstract="false"
@@ -27420,23 +27338,6 @@ 
<parameter name="cursor" type="android.database.Cursor">

</parameter>

</method>

<method name="onQueryEntitiesComplete"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="token" type="int">

</parameter>

<parameter name="cookie" type="java.lang.Object">

</parameter>

<parameter name="iterator" type="android.content.EntityIterator">

</parameter>

</method>

<method name="onUpdateComplete"

 return="void"

 abstract="false"
@@ -28323,21 +28224,6 @@ 
<parameter name="values" type="android.content.ContentValues">

</parameter>

</method>

<method name="insertEntity"

 return="android.net.Uri"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="entity" type="android.content.Entity">

</parameter>

</method>

<method name="isTemporary"

 return="boolean"

 abstract="false"
@@ -28456,25 +28342,6 @@ 
<parameter name="sortOrder" type="java.lang.String">

</parameter>

</method>

<method name="queryEntities"

 return="android.content.EntityIterator"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="selection" type="java.lang.String">

</parameter>

<parameter name="selectionArgs" type="java.lang.String[]">

</parameter>

<parameter name="sortOrder" type="java.lang.String">

</parameter>

</method>

<method name="setPathPermissions"

 return="void"

 abstract="false"
@@ -28533,21 +28400,6 @@ 
<parameter name="selectionArgs" type="java.lang.String[]">

</parameter>

</method>

<method name="updateEntity"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="entity" type="android.content.Entity">

</parameter>

</method>

</class>

<class name="ContentProviderClient"

 extends="java.lang.Object"
@@ -28653,23 +28505,6 @@ 
<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

<method name="insertEntity"

 return="android.net.Uri"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="entity" type="android.content.Entity">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

<method name="openAssetFile"

 return="android.content.res.AssetFileDescriptor"

 abstract="false"
@@ -28731,27 +28566,6 @@ 
<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

<method name="queryEntities"

 return="android.content.EntityIterator"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="selection" type="java.lang.String">

</parameter>

<parameter name="selectionArgs" type="java.lang.String[]">

</parameter>

<parameter name="sortOrder" type="java.lang.String">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

<method name="release"

 return="boolean"

 abstract="false"
@@ -28784,23 +28598,6 @@ 
<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

<method name="updateEntity"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="entity" type="android.content.Entity">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</class>

<class name="ContentProviderOperation"

 extends="java.lang.Object"
@@ -29689,27 +29486,6 @@ 
<parameter name="sortOrder" type="java.lang.String">

</parameter>

</method>

<method name="queryEntities"

 return="android.content.EntityIterator"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="selection" type="java.lang.String">

</parameter>

<parameter name="selectionArgs" type="java.lang.String[]">

</parameter>

<parameter name="sortOrder" type="java.lang.String">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

<method name="registerContentObserver"

 return="void"

 abstract="false"
@@ -33171,199 +32947,6 @@ 
</parameter>

</method>

</interface>

<class name="Entity"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<constructor name="Entity"

 type="android.content.Entity"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="values" type="android.content.ContentValues">

</parameter>

</constructor>

<method name="addSubValue"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="values" type="android.content.ContentValues">

</parameter>

</method>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getEntityValues"

 return="android.content.ContentValues"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSubValues"

 return="java.util.ArrayList&lt;android.content.Entity.NamedContentValues&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="android.os.Parcel">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Entity.NamedContentValues"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="Entity.NamedContentValues"

 type="android.content.Entity.NamedContentValues"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">

</parameter>

<parameter name="values" type="android.content.ContentValues">

</parameter>

</constructor>

<field name="uri"

 type="android.net.Uri"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="values"

 type="android.content.ContentValues"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<interface name="EntityIterator"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="close"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="hasNext"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

<method name="next"

 return="android.content.Entity"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

<method name="reset"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</interface>

<class name="Intent"

 extends="java.lang.Object"

 abstract="false"
@@ -115542,6 +115125,82 @@ 
>

</field>

</class>

<class name="ContactsContract.RawContacts.Entity"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.provider.BaseColumns">

</implements>

<field name="CONTENT_DIRECTORY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;entity&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DATA_ID"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;data_id&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ContactsContract.RawContactsEntity"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.provider.BaseColumns">

</implements>

<field name="CONTENT_TYPE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;vnd.android.cursor.dir/raw_contact_entity&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CONTENT_URI"

 type="android.net.Uri"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DATA_ID"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;data_id&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ContactsContract.Settings"

 extends="java.lang.Object"

 abstract="false"

core/java/android/content/AbstractCursorEntityIterator.java

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import android.os.RemoteException; 
 * An abstract class that makes it easy to implement an EntityIterator over a cursor.

 * The user must implement {@link #newEntityFromCursorLocked}, which runs inside of a

 * database transaction.

 * @hide

 */

public abstract class AbstractCursorEntityIterator implements EntityIterator {

    private final Cursor mEntityCursor;

core/java/android/content/AsyncQueryHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ public abstract class AsyncQueryHandler extends Handler { 
     * @param token The token to identify the query.

     * @param cookie The cookie object.

     * @param iterator The iterator holding the query results.

     * @hide

     */

    protected void onQueryEntitiesComplete(int token, Object cookie, EntityIterator iterator) {

        // Empty

core/java/android/content/ContentProvider.java

+7 −19
Original line number Diff line number Diff line
@@ -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>.

     *

core/java/android/content/ContentProviderClient.java

+4 −11
Original line number Diff line number Diff line
@@ -89,22 +89,15 @@ public class ContentProviderClient { 
        return mContentProvider.openAssetFile(url, mode);

    }



    /** see {@link ContentProvider#queryEntities} */

    /**

     * see {@link ContentProvider#queryEntities}

     * @hide

     */

    public EntityIterator queryEntities(Uri uri, String selection, String[] selectionArgs,

            String sortOrder) throws RemoteException {

        return mContentProvider.queryEntities(uri, selection, selectionArgs, sortOrder);

    }



    /** see {@link ContentProvider#insertEntity} */

    public Uri insertEntity(Uri uri, Entity entity) throws RemoteException {

        return mContentProvider.insertEntity(uri, entity);

    }



    /** see {@link ContentProvider#updateEntity} */

    public int updateEntity(Uri uri, Entity entity) throws RemoteException {

        return mContentProvider.updateEntity(uri, entity);

    }



    /** see {@link ContentProvider#applyBatch} */

    public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)

            throws RemoteException, OperationApplicationException {