Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89e3d476 authored by Rajeev Kumar's avatar Rajeev Kumar Committed by android-build-merger
Browse files

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

am: 2bb62683

Change-Id: If903f50b0f1f1cf66cd539c78bf888a5802e28bf
parents da28d3d2 2bb62683

core/java/android/appwidget/AppWidgetHost.java

+4 −2
Original line number Diff line number Diff line
@@ -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);