summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitri Plotnikov <dplotnikov@google.com>2011-01-18 09:41:29 -0800
committerDmitri Plotnikov <dplotnikov@google.com>2011-01-18 09:41:29 -0800
commit4afde4fda383116a9730aea1e931d4bce7ea0fd0 (patch)
tree09da47437d0789bfb6489d074aabf437a92d2fb1
parent60610d245f899c8c48ba6c7e94c0a20010fc6eed (diff)
downloadframeworks_base-4afde4fda383116a9730aea1e931d4bce7ea0fd0.zip
frameworks_base-4afde4fda383116a9730aea1e931d4bce7ea0fd0.tar.gz
frameworks_base-4afde4fda383116a9730aea1e931d4bce7ea0fd0.tar.bz2
Hiding the AsyncTaskLoader.waitForLoader method
I introduced this method a couple of weeks ago, but then we had a chat with Dianne and she made a good point that rather than having this behavior on AsyncTaskLoader, we should have it on LoaderManager and then it will cover all kinds of loaders, not just the ones inheriting from AsyncTaskLoader. She suggested that we postpone that work until after Honeycomb. Change-Id: I1939956296cddb678791ba652ab5f4a0dd45eea1
-rw-r--r--api/11.xml11
-rw-r--r--api/current.xml11
-rw-r--r--core/java/android/content/AsyncTaskLoader.java4
3 files changed, 3 insertions, 23 deletions
diff --git a/api/11.xml b/api/11.xml
index b087c20..5087eca 100644
--- a/api/11.xml
+++ b/api/11.xml
@@ -43822,17 +43822,6 @@
<parameter name="delayMS" type="long">
</parameter>
</method>
-<method name="waitForLoader"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
</class>
<class name="BroadcastReceiver"
extends="java.lang.Object"
diff --git a/api/current.xml b/api/current.xml
index b087c20..5087eca 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -43822,17 +43822,6 @@
<parameter name="delayMS" type="long">
</parameter>
</method>
-<method name="waitForLoader"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
</class>
<class name="BroadcastReceiver"
extends="java.lang.Object"
diff --git a/core/java/android/content/AsyncTaskLoader.java b/core/java/android/content/AsyncTaskLoader.java
index 4cf356f..3d6182b 100644
--- a/core/java/android/content/AsyncTaskLoader.java
+++ b/core/java/android/content/AsyncTaskLoader.java
@@ -175,7 +175,7 @@ public abstract class AsyncTaskLoader<D> extends Loader<D> {
@Deprecated
public void onCancelled(D data) {
}
-
+
void executePendingTask() {
if (mCancellingTask == null && mTask != null) {
if (mTask.waiting) {
@@ -245,6 +245,8 @@ public abstract class AsyncTaskLoader<D> extends Loader<D> {
* thread would cause a deadlock.
* <p>
* Use for testing only. <b>Never</b> call this from a UI thread.
+ *
+ * @hide
*/
public void waitForLoader() {
LoadTask task = mTask;