Merge "Add a condition in AppWidgetHost to honor config_enableAppWidgetService." into pi-dev

This commit is contained in:
TreeHugger Robot
2018-04-10 15:32:44 +00:00
committed by Android (Google) Code Review

View File

@@ -37,6 +37,7 @@ import android.util.SparseArray;
import android.widget.RemoteViews;
import android.widget.RemoteViews.OnClickHandler;
import com.android.internal.R;
import com.android.internal.appwidget.IAppWidgetHost;
import com.android.internal.appwidget.IAppWidgetService;
@@ -171,8 +172,9 @@ public class AppWidgetHost {
return;
}
sServiceInitialized = true;
if (!context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_APP_WIDGETS)) {
PackageManager packageManager = context.getPackageManager();
if (!packageManager.hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS)
&& !context.getResources().getBoolean(R.bool.config_enableAppWidgetService)) {
return;
}
IBinder b = ServiceManager.getService(Context.APPWIDGET_SERVICE);