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

Merge "Fix setApplicationNightMode did not persist night mode." into sc-dev am: 5b1b2b1555

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

Change-Id: I489144224a4fa257ab68c2a7af5a118f175fa346
This commit is contained in:
Wei Sheng Shih
2021-07-14 01:50:24 +00:00
committed by Automerger Merge Worker
parent 7e3a4dc30b 5b1b2b1555
commit db9a73f740
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -6471,12 +6471,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
Slog.w(TAG, "Override application configuration: cannot find pid " + mPid); Slog.w(TAG, "Override application configuration: cannot find pid " + mPid);
return; return;
} }
if (wpc.getNightMode() == mNightMode) { wpc.setOverrideNightMode(mNightMode);
return;
}
if (!wpc.setOverrideNightMode(mNightMode)) {
return;
}
wpc.updateNightModeForAllActivities(mNightMode); wpc.updateNightModeForAllActivities(mNightMode);
mPackageConfigPersister.updateFromImpl(wpc.mName, wpc.mUserId, this); mPackageConfigPersister.updateFromImpl(wpc.mName, wpc.mUserId, this);
} finally { } finally {

8
services/core/java/com/android/server/wm/ConfigurationContainer.java
View File

@@ -545,8 +545,8 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> {
* @return true if the nightMode has been changed. * @return true if the nightMode has been changed.
*/ */
public boolean setOverrideNightMode(int nightMode) { public boolean setOverrideNightMode(int nightMode) {
final int currentUiMode = mFullConfiguration.uiMode; final int currentUiMode = mRequestedOverrideConfiguration.uiMode;
final int currentNightMode = getNightMode(); final int currentNightMode = currentUiMode & Configuration.UI_MODE_NIGHT_MASK;
final int validNightMode = nightMode & Configuration.UI_MODE_NIGHT_MASK; final int validNightMode = nightMode & Configuration.UI_MODE_NIGHT_MASK;
if (currentNightMode == validNightMode) { if (currentNightMode == validNightMode) {
return false; return false;
@@ -558,10 +558,6 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> {
return true; return true;
} }
int getNightMode() {
return mFullConfiguration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
}
public boolean isActivityTypeDream() { public boolean isActivityTypeDream() {
return getActivityType() == ACTIVITY_TYPE_DREAM; return getActivityType() == ACTIVITY_TYPE_DREAM;
} }