Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Varun Shah
2023-04-13 03:38:10 +00:00
committed by Android (Google) Code Review
parent c6d36c2946 e8bb4776c8
commit 72ec810a0c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/Settings.java
View File

@@ -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
*

6
core/res/res/values/config.xml
View File

@@ -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.