commit 2a6d2e4a2d60354c0b4b9f601bb5e1eb348efbb0
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 02 20:38:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 02 20:38:41 2021 +0000
tree 4683aca26968c5ab717958e529ace44c25b4ad4d
parent 00f07cf138898dc3f93db025d8ab7b84f66310f6
parent bfa57a33ee22b5c50852d54c2ce56f568ceb8e8d

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

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 52b1a8d..5b74a88 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;
     }