commit 9059706e7b571e22656fdb8da13a3c7135cd2e1b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 02 19:05:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 02 19:05:16 2021 +0000
tree b27c0b921797b40a4ee39a3dfb769a6b23437fa1
parent 08bea2183d2c2946d83bb173843f865a2b06d228
parent b6dc427c50362a1be0db1883ad237c226fec112e

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c

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;
     }