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

Commit 6c62e1ce authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ib27ece740f881087792d339cb81f0a1743c238bc
parents 343ec6c6 5b1b2b15

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+1 −6
Original line number Diff line number Diff line
@@ -6530,12 +6530,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                        Slog.w(TAG, "Override application configuration: cannot find pid " + mPid);

                        return;

                    }

                    if (wpc.getNightMode() == mNightMode) {

                        return;

                    }

                    if (!wpc.setOverrideNightMode(mNightMode)) {

                        return;

                    }

                    wpc.setOverrideNightMode(mNightMode);

                    wpc.updateNightModeForAllActivities(mNightMode);

                    mPackageConfigPersister.updateFromImpl(wpc.mName, wpc.mUserId, this);

                } finally {

services/core/java/com/android/server/wm/ConfigurationContainer.java

+2 −6
Original line number Diff line number Diff line
@@ -550,8 +550,8 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 
     * @return true if the nightMode has been changed.

     */

    public boolean setOverrideNightMode(int nightMode) {

        final int currentUiMode = mFullConfiguration.uiMode;

        final int currentNightMode = getNightMode();

        final int currentUiMode = mRequestedOverrideConfiguration.uiMode;

        final int currentNightMode = currentUiMode & Configuration.UI_MODE_NIGHT_MASK;

        final int validNightMode = nightMode & Configuration.UI_MODE_NIGHT_MASK;

        if (currentNightMode == validNightMode) {

            return false;
@@ -563,10 +563,6 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 
        return true;

    }



    int getNightMode() {

        return mFullConfiguration.uiMode & Configuration.UI_MODE_NIGHT_MASK;

    }



    public boolean isActivityTypeDream() {

        return getActivityType() == ACTIVITY_TYPE_DREAM;

    }