diff options
| author | Ray Chen <raychen@google.com> | 2010-04-07 12:14:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-07 12:14:49 -0700 |
| commit | 84d12f3fe7aad8d024dd7d89aea813d5e556387e (patch) | |
| tree | ed1be700eb7ef36f63032a5c70d225cead416618 /core/java/android | |
| parent | 7aed1e14b53778ea4044362b001fb5bf5cac09c0 (diff) | |
| parent | dbad286c4640ab7d2244695c5b175ebd1b6fcbab (diff) | |
am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken
* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/Context.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index ee872903e443..3a2aa552a026 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -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 |