commit 5c8b06b83dc1fb650910a32dcbf31d002474ac0f
author Ted Bauer <tedbauer@google.com> Mon Sep 09 17:21:29 2024 +0000
committer Ted Bauer <tedbauer@google.com> Mon Sep 09 17:21:29 2024 +0000
tree 57b6e33315a511710c77f34d7b2d7e75e56a24a4
parent af78422c0da13814f52de6f4c83bcdd9c54ffc9d

Switch to using override type enum

Bug: 360205436
Test: m
Change-Id: Ic91a9a48a6517d277ce21e463cf3d6df57216c82

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

diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index cbea7aa..5c3640f 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -445,7 +445,9 @@
       proto.write(StorageRequestMessage.FlagOverrideMessage.PACKAGE_NAME, packageName);
       proto.write(StorageRequestMessage.FlagOverrideMessage.FLAG_NAME, flagName);
       proto.write(StorageRequestMessage.FlagOverrideMessage.FLAG_VALUE, flagValue);
-      proto.write(StorageRequestMessage.FlagOverrideMessage.IS_LOCAL, isLocal);
+      proto.write(StorageRequestMessage.FlagOverrideMessage.OVERRIDE_TYPE, isLocal
+                ? StorageRequestMessage.LOCAL_ON_REBOOT
+                : StorageRequestMessage.SERVER_ON_REBOOT);
       proto.end(msgToken);
       proto.end(msgsToken);
     }