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

Commit 44dcc2b0 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by android-build-merger
Browse files

Merge "Allowing AppWidgetService to start without FEATURE_APP_WIDGETS" into nyc-dev 

am: a8213eeb

* commit 'a8213eeb':
  Allowing AppWidgetService to start without FEATURE_APP_WIDGETS

Change-Id: Ia141a88c1da99143fd3d123625168763091ab69a
parents f42e9b1b a8213eeb

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2500,4 +2500,8 @@ 
    <!-- True if the device supports at least one form of multi-window.

         E.g. freeform, split-screen, picture-in-picture. -->

    <bool name="config_supportsMultiWindow">true</bool>



    <!-- True if the device requires AppWidgetService even if it does not have

         the PackageManager.FEATURE_APP_WIDGETS feature -->

    <bool name="config_enableAppWidgetService">false</bool>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ 
  <java-symbol type="bool" name="config_supportsMultiWindow" />

  <java-symbol type="bool" name="config_guestUserEphemeral" />

  <java-symbol type="bool" name="config_localDisplaysMirrorContent" />

  <java-symbol type="bool" name="config_enableAppWidgetService" />

  <java-symbol type="string" name="config_defaultPictureInPictureBounds" />

  <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" />

  <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" />

services/java/com/android/server/SystemServer.java

+2 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,8 @@ public final class SystemServer { 
                    mSystemServiceManager.startService(BACKUP_MANAGER_SERVICE_CLASS);

                }



                if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS)) {

                if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS)

                    || context.getResources().getBoolean(R.bool.config_enableAppWidgetService)) {

                    mSystemServiceManager.startService(APPWIDGET_SERVICE_CLASS);

                }