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

Commit dbad286c authored by Ray Chen's avatar Ray Chen Committed by Android Git Automerger
Browse files

am 25c2dd60: Merge "Per requested by API council, rename... 

am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo

Merge commit '25c2dd60' into froyo-plus-aosp

* commit '25c2dd60':
  Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
parents d66e2b23 25c2dd60

api/current.xml

+3 −3
Original line number Diff line number Diff line
@@ -85230,7 +85230,7 @@ 
</parameter>

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

</parameter>

<parameter name="callback" type="android.media.MediaScannerConnection.ScanResultListener">

<parameter name="callback" type="android.media.MediaScannerConnection.OnScanCompletedListener">

</parameter>

</method>

</class>
@@ -85241,7 +85241,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.media.MediaScannerConnection.ScanResultListener">

<implements name="android.media.MediaScannerConnection.OnScanCompletedListener">

</implements>

<method name="onMediaScannerConnected"

 return="void"
@@ -85270,7 +85270,7 @@ 
</parameter>

</method>

</interface>

<interface name="MediaScannerConnection.ScanResultListener"

<interface name="MediaScannerConnection.OnScanCompletedListener"

 abstract="true"

 static="true"

 final="false"

core/java/android/content/Context.java

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.database.sqlite.SQLiteDatabase; 
import android.database.sqlite.SQLiteDatabase.CursorFactory;

import android.graphics.Bitmap;

import android.graphics.drawable.Drawable;

import android.media.MediaScannerConnection.ScanResultListener;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;
@@ -444,7 +443,7 @@ public abstract class Context { 
     * are not automatically scanned by the media scanner, you can explicitly

     * add them to the media database with

     * {@link android.media.MediaScannerConnection#scanFile(Context, String[], String[],

     *      ScanResultListener) MediaScannerConnection.scanFile}.

     *      OnScanCompletedListener) MediaScannerConnection.scanFile}.

     * Note that this is not the same as

     * {@link android.os.Environment#getExternalStoragePublicDirectory

     * Environment.getExternalStoragePublicDirectory()}, which provides

media/java/android/media/MediaScannerConnection.java

+30 −30
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class MediaScannerConnection implements ServiceConnection { 
     * Interface for notifying clients of the result of scanning a

     * requested media file.

     */

    public interface ScanResultListener {

    public interface OnScanCompletedListener {

        /**

         * Called to notify the client when the media scanner has finished

         * scanning a file.
@@ -76,7 +76,7 @@ public class MediaScannerConnection implements ServiceConnection { 
     * when a connection to the MediaScanner service has been established

     * and when the scanning of a file has completed.

     */

    public interface MediaScannerConnectionClient extends ScanResultListener {

    public interface MediaScannerConnectionClient extends OnScanCompletedListener {

        /**

         * Called to notify the client when a connection to the

         * MediaScanner service has been established.
@@ -179,11 +179,11 @@ public class MediaScannerConnection implements ServiceConnection { 
    static class ClientProxy implements MediaScannerConnectionClient {

        final String[] mPaths;

        final String[] mMimeTypes;

        final ScanResultListener mClient;

        final OnScanCompletedListener mClient;

        MediaScannerConnection mConnection;

        int mNextPath;



        ClientProxy(String[] paths, String[] mimeTypes, ScanResultListener client) {

        ClientProxy(String[] paths, String[] mimeTypes, OnScanCompletedListener client) {

            mPaths = paths;

            mMimeTypes = mimeTypes;

            mClient = client;
@@ -229,7 +229,7 @@ public class MediaScannerConnection implements ServiceConnection { 
     * @see scanFile(String, String)

     */

    public static void scanFile(Context context, String[] paths, String[] mimeTypes,

            ScanResultListener callback) {

            OnScanCompletedListener callback) {

        ClientProxy client = new ClientProxy(paths, mimeTypes, callback);

        MediaScannerConnection connection = new MediaScannerConnection(context, client);

        client.mConnection = connection;