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

Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c am: 1d00be1ad5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865

Change-Id: If3aaeebba9ebde14a1a7f04a570a515b23b36234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Varun Shah
2023-04-13 03:52:18 +00:00
committed by Automerger Merge Worker
parent 682413d366 1d00be1ad5
commit 582f0e130c
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
View File

@@ -121,7 +121,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
final PowerManager powerManager = context.getSystemService(PowerManager.class);
final PackageManager packageManager = context.getPackageManager();
final String packageName = context.getString(
com.android.internal.R.string.config_defaultWellbeingPackage);
com.android.internal.R.string.config_systemWellbeing);
try {
uid = packageManager.getApplicationInfo(packageName, /* flags= */ 0).uid;
} catch (PackageManager.NameNotFoundException e) {

2
src/com/android/settings/display/darkmode/BedtimeSettings.java
View File

@@ -37,7 +37,7 @@ public final class BedtimeSettings {
mContext = context;
mPackageManager = context.getPackageManager();
mWellbeingPackage = mContext.getResources().getString(
com.android.internal.R.string.config_defaultWellbeingPackage);
com.android.internal.R.string.config_systemWellbeing);
}
/**