Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe6db36fc0039d10f352756b2c8d398a225c6a55
This commit is contained in:
Treehugger Robot
2021-03-02 20:38:41 +00:00
committed by Automerger Merge Worker

View File

@@ -180,6 +180,9 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
// Keep Package Installer enabled. // Keep Package Installer enabled.
keepEnabledPackages.add(mContext.getString(R.string.config_package_installer_package_name)); keepEnabledPackages.add(mContext.getString(R.string.config_package_installer_package_name));
if (mPm.getWellbeingPackageName() != null) {
keepEnabledPackages.add(mPm.getWellbeingPackageName());
}
return keepEnabledPackages; return keepEnabledPackages;
} }