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

Commit bc350c12 authored by Dennis Shen's avatar Dennis Shen Committed by Gerrit Code Review
Browse files

Merge "perform local immediate override" into main

parents 9a644bdc bdee37c4

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

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,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);