commit bfa57a33ee22b5c50852d54c2ce56f568ceb8e8d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 02 19:47:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 02 19:47:20 2021 +0000
tree d7c295ae22e74d83c5ec047edf310eaa7e8ffb53
parent a409521a640a52e22cfe785c49f3987a9bb53974
parent 9059706e7b571e22656fdb8da13a3c7135cd2e1b

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd1aa5ea04aa3ff22ece59fe04bc69c7e15385bd

src/com/android/settings/applications/ApplicationFeatureProviderImpl.java

diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index ac8146a..153e339 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -180,6 +180,9 @@
         // Keep Package Installer enabled.
         keepEnabledPackages.add(mContext.getString(R.string.config_package_installer_package_name));
 
+        if (mPm.getWellbeingPackageName() != null) {
+            keepEnabledPackages.add(mPm.getWellbeingPackageName());
+        }
         return keepEnabledPackages;
     }