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

Commit 72ec810a authored by Varun Shah's avatar Varun Shah Committed by Android (Google) Code Review
Browse files

Merge "Update the default wellbeing package config." into udc-dev

parents c6d36c29 e8bb4776

core/java/android/provider/Settings.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2585,7 +2585,7 @@ public final class Settings { 
     * <p>

     * <p>

     * To start an activity with this intent, apps should set the wellbeing package explicitly in

     * To start an activity with this intent, apps should set the wellbeing package explicitly in

     * the intent together with this action. The wellbeing package is defined in

     * the intent together with this action. The wellbeing package is defined in

     * {@code com.android.internal.R.string.config_defaultWellbeingPackage}.

     * {@code com.android.internal.R.string.config_systemWellbeing}.

     * <p>

     * <p>

     * Output: Nothing

     * Output: Nothing

     *

     *

core/res/res/values/config.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -4306,8 +4306,12 @@ 
         This package must be trusted, as it has the permissions to control other applications

         This package must be trusted, as it has the permissions to control other applications

         on the device.

         on the device.

         Example: "com.android.wellbeing"

         Example: "com.android.wellbeing"



         Note: This config is deprecated, please use config_systemWellbeing instead.

     -->

     -->

    <string name="config_defaultWellbeingPackage" translatable="false"></string>

    <string name="config_defaultWellbeingPackage" translatable="false">

        @string/config_systemWellbeing

    </string>





    <!-- The component name for the default system attention service.

    <!-- The component name for the default system attention service.

         This service must be trusted, as it can be activated without explicit consent of the user.

         This service must be trusted, as it can be activated without explicit consent of the user.