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

Commit e5aca701 authored by Dennis Shen's avatar Dennis Shen Committed by Automerger Merge Worker
Browse files

Merge "perform local immediate override" into main am: bc350c12 

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



Change-Id: I3bd11e6e5f756dc2b569b715e806e8bf4921a8a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bed2d455 bc350c12

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ public class SettingsToPropertiesMapper { 
      proto.write(StorageRequestMessage.FlagOverrideMessage.FLAG_NAME, flagName);

      proto.write(StorageRequestMessage.FlagOverrideMessage.FLAG_VALUE, flagValue);

      proto.write(StorageRequestMessage.FlagOverrideMessage.OVERRIDE_TYPE, isLocal

                ? StorageRequestMessage.LOCAL_ON_REBOOT

                ? StorageRequestMessage.LOCAL_IMMEDIATE

                : StorageRequestMessage.SERVER_ON_REBOOT);

      proto.end(msgToken);

      proto.end(msgsToken);