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

Commit 569f2a17 authored by Varun Shah's avatar Varun Shah Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22531397



Change-Id: Ie93cbe0c4e202fa8d1a5e8c3ef93d0d5578fff8b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c32b6427 72ec810a

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -2585,7 +2585,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
@@ -4306,8 +4306,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.