From 0ddf6aa0a4e5db30a19f27bb3372d8a86fba1660 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 20 Apr 2017 15:25:47 -0700 Subject: [PATCH] Renaming setAsyncExecutor to setExecutor Bug: 37534990 Test: Tests updated Change-Id: I9ea467d05b4ac4d96c23d53750727096a511686d --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/appwidget/AppWidgetHostView.java | 2 +- core/java/android/widget/RemoteViewsAdapter.java | 7 +------ .../src/android/widget/AppWidgetHostViewTest.java | 4 ++-- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index afb456907b294..3dc875b4fae4d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7081,7 +7081,7 @@ package android.appwidget { method protected android.view.View getErrorView(); method protected void prepareView(android.view.View); method public void setAppWidget(int, android.appwidget.AppWidgetProviderInfo); - method public void setAsyncExecutor(java.util.concurrent.Executor); + method public void setExecutor(java.util.concurrent.Executor); method public void updateAppWidget(android.widget.RemoteViews); method public void updateAppWidgetOptions(android.os.Bundle); method public void updateAppWidgetSize(android.os.Bundle, int, int, int, int); diff --git a/api/system-current.txt b/api/system-current.txt index d18006c82aa57..c58caf35bc1b7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7547,7 +7547,7 @@ package android.appwidget { method protected android.view.View getErrorView(); method protected void prepareView(android.view.View); method public void setAppWidget(int, android.appwidget.AppWidgetProviderInfo); - method public void setAsyncExecutor(java.util.concurrent.Executor); + method public void setExecutor(java.util.concurrent.Executor); method public void updateAppWidget(android.widget.RemoteViews); method public void updateAppWidgetOptions(android.os.Bundle); method public void updateAppWidgetSize(android.os.Bundle, int, int, int, int); diff --git a/api/test-current.txt b/api/test-current.txt index 0ca882a11795e..9706de2fc7b14 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -7112,7 +7112,7 @@ package android.appwidget { method protected android.view.View getErrorView(); method protected void prepareView(android.view.View); method public void setAppWidget(int, android.appwidget.AppWidgetProviderInfo); - method public void setAsyncExecutor(java.util.concurrent.Executor); + method public void setExecutor(java.util.concurrent.Executor); method public void updateAppWidget(android.widget.RemoteViews); method public void updateAppWidgetOptions(android.os.Bundle); method public void updateAppWidgetSize(android.os.Bundle, int, int, int, int); diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index 624ec871a15aa..1242cb0fbdfa3 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -353,7 +353,7 @@ public class AppWidgetHostView extends FrameLayout { * * @param executor the executor to use or null. */ - public void setAsyncExecutor(Executor executor) { + public void setExecutor(Executor executor) { if (mLastExecutionSignal != null) { mLastExecutionSignal.cancel(); mLastExecutionSignal = null; diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java index 11e0a3fa47743..09686521b4323 100644 --- a/core/java/android/widget/RemoteViewsAdapter.java +++ b/core/java/android/widget/RemoteViewsAdapter.java @@ -47,11 +47,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.concurrent.Executor; -import java.lang.ref.WeakReference; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedList; - /** * An adapter to a RemoteViewsService which fetches and caches RemoteViews * to be later inflated as child views. @@ -1114,7 +1109,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback layout = (RemoteViewsFrameLayout) convertView; } else { layout = new RemoteViewsFrameLayout(parent.getContext(), mCache); - layout.setAsyncExecutor(mAsyncViewLoadExecutor); + layout.setExecutor(mAsyncViewLoadExecutor); } if (isInCache) { diff --git a/core/tests/coretests/src/android/widget/AppWidgetHostViewTest.java b/core/tests/coretests/src/android/widget/AppWidgetHostViewTest.java index 1e55fb182b4a8..4f31c4ee72a4d 100644 --- a/core/tests/coretests/src/android/widget/AppWidgetHostViewTest.java +++ b/core/tests/coretests/src/android/widget/AppWidgetHostViewTest.java @@ -83,7 +83,7 @@ public class AppWidgetHostViewTest { @Test public void asyncInflation() throws Exception { RunnableList executor = new RunnableList(); - mHostView.setAsyncExecutor(executor); + mHostView.setExecutor(executor); mHostView.updateAppWidget(mViews); assertNull(mHostView.findViewById(R.id.image)); @@ -100,7 +100,7 @@ public class AppWidgetHostViewTest { @Test public void asyncInflation_cancelled() throws Exception { RunnableList executor = new RunnableList(); - mHostView.setAsyncExecutor(executor); + mHostView.setExecutor(executor); mHostView.updateAppWidget(mViews.clone()); mHostView.updateAppWidget(mViews.clone());