Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb

This commit is contained in:
Dmitri Plotnikov
2011-01-18 11:01:35 -08:00
committed by Android (Google) Code Review
3 changed files with 3 additions and 23 deletions

View File

@@ -43822,17 +43822,6 @@
<parameter name="delayMS" type="long"> <parameter name="delayMS" type="long">
</parameter> </parameter>
</method> </method>
<method name="waitForLoader"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
</class> </class>
<class name="BroadcastReceiver" <class name="BroadcastReceiver"
extends="java.lang.Object" extends="java.lang.Object"

View File

@@ -43822,17 +43822,6 @@
<parameter name="delayMS" type="long"> <parameter name="delayMS" type="long">
</parameter> </parameter>
</method> </method>
<method name="waitForLoader"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
</class> </class>
<class name="BroadcastReceiver" <class name="BroadcastReceiver"
extends="java.lang.Object" extends="java.lang.Object"

View File

@@ -175,7 +175,7 @@ public abstract class AsyncTaskLoader<D> extends Loader<D> {
@Deprecated @Deprecated
public void onCancelled(D data) { public void onCancelled(D data) {
} }
void executePendingTask() { void executePendingTask() {
if (mCancellingTask == null && mTask != null) { if (mCancellingTask == null && mTask != null) {
if (mTask.waiting) { if (mTask.waiting) {
@@ -245,6 +245,8 @@ public abstract class AsyncTaskLoader<D> extends Loader<D> {
* thread would cause a deadlock. * thread would cause a deadlock.
* <p> * <p>
* Use for testing only. <b>Never</b> call this from a UI thread. * Use for testing only. <b>Never</b> call this from a UI thread.
*
* @hide
*/ */
public void waitForLoader() { public void waitForLoader() {
LoadTask task = mTask; LoadTask task = mTask;