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

Commit f7734c57 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Update the default wellbeing package config." into udc-dev am: 72ec810a am: 4465f19f"
parents 8606cf3b e171fdaf

core/java/android/provider/Settings.java

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

     * 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

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

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

     * <p>

     * Output: Nothing

     *

core/res/res/values/config.xml

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

         on the device.

         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.

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