From 46baf533f5f66e1c5ebc8ca45c2ed5211c790cdf Mon Sep 17 00:00:00 2001
From: Andrew Stadler <stadler@android.com>
Date: Mon, 21 Jun 2010 10:23:46 -0700
Subject: [PATCH] Add getWrappedCursor, and update the JavaDoc.

Change-Id: I7d0513056b4d83b457374d783465fe848b7e530c
---
 api/current.xml                               | 11 +++++++++++
 core/java/android/database/CursorWrapper.java | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 851e9c29a06e3..b9c9fe984144d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -58339,6 +58339,17 @@
  visibility="public"
 >
 </method>
+<method name="getWrappedCursor"
+ return="android.database.Cursor"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="isAfterLast"
  return="boolean"
  abstract="false"
diff --git a/core/java/android/database/CursorWrapper.java b/core/java/android/database/CursorWrapper.java
index 2ac94707b607f..3c3bd430a150f 100644
--- a/core/java/android/database/CursorWrapper.java
+++ b/core/java/android/database/CursorWrapper.java
@@ -17,22 +17,28 @@
 package android.database;
 
 import android.content.ContentResolver;
-import android.database.CharArrayBuffer;
 import android.net.Uri;
 import android.os.Bundle;
 
-import java.util.Map;
-
 /**
- * Wrapper class for Cursor that delegates all calls to the actual cursor object
+ * Wrapper class for Cursor that delegates all calls to the actual cursor object.  The primary
+ * use for this class is to extend a cursor while overriding only a subset of its methods.
  */
-
 public class CursorWrapper implements Cursor {
 
+    private final Cursor mCursor;
+
     public CursorWrapper(Cursor cursor) {
         mCursor = cursor;
     }
 
+    /**
+     * @return the wrapped cursor
+     */
+    public Cursor getWrappedCursor() {
+        return mCursor;
+    }
+
     public void close() {
         mCursor.close(); 
     }
@@ -189,7 +195,5 @@ public class CursorWrapper implements Cursor {
     public void unregisterDataSetObserver(DataSetObserver observer) {
         mCursor.unregisterDataSetObserver(observer);
     }
-
-    private Cursor mCursor;    
 }