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

Commit e73d10c6 authored by Jason parks's avatar Jason parks Committed by Android (Google) Code Review
Browse files

Merge "Deprecated the managed cursor API's on Activity. Loaders are the new world order."

parents db53e0ef 6ed50de6

api/current.xml

+3 −3
Original line number Diff line number Diff line
@@ -22376,7 +22376,7 @@ 
 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="uri" type="android.net.Uri">
@@ -23763,7 +23763,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="c" type="android.database.Cursor">
@@ -23808,7 +23808,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

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

core/java/android/app/Activity.java

+13 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.ComponentCallbacks; 
import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.content.CursorLoader;

import android.content.IIntentSender;

import android.content.Intent;

import android.content.IntentSender;
@@ -1650,7 +1651,10 @@ public class Activity extends ContextThemeWrapper 
     * @see ContentResolver#query(android.net.Uri , String[], String, String[], String)

     * @see #startManagingCursor

     * @hide

     *

     * @deprecated Use {@link CursorLoader} instead.

     */

    @Deprecated

    public final Cursor managedQuery(Uri uri, String[] projection, String selection,

            String sortOrder) {

        Cursor c = getContentResolver().query(uri, projection, selection, null, sortOrder);
@@ -1681,7 +1685,10 @@ public class Activity extends ContextThemeWrapper 
     * 

     * @see ContentResolver#query(android.net.Uri , String[], String, String[], String)

     * @see #startManagingCursor

     *

     * @deprecated Use {@link CursorLoader} instead.

     */

    @Deprecated

    public final Cursor managedQuery(Uri uri, String[] projection, String selection,

            String[] selectionArgs, String sortOrder) {

        Cursor c = getContentResolver().query(uri, projection, selection, selectionArgs, sortOrder);
@@ -1707,7 +1714,10 @@ public class Activity extends ContextThemeWrapper 
     * 

     * @see #managedQuery(android.net.Uri , String[], String, String[], String)

     * @see #stopManagingCursor

     *

     * @deprecated Use {@link CursorLoader} instead.

     */

    @Deprecated

    public void startManagingCursor(Cursor c) {

        synchronized (mManagedCursors) {

            mManagedCursors.add(new ManagedCursor(c));
@@ -1722,7 +1732,10 @@ public class Activity extends ContextThemeWrapper 
     * @param c The Cursor that was being managed.

     * 

     * @see #startManagingCursor

     *

     * @deprecated Use {@link CursorLoader} instead.

     */

    @Deprecated

    public void stopManagingCursor(Cursor c) {

        synchronized (mManagedCursors) {

            final int N = mManagedCursors.size();