commit ee7802f577ad9463b12505eef2e2db524f817a6e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 06:22:16 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 06:22:16 2018 +0000
tree dd2f8365687bdbe93668a5cb5b39d1c4140f2557
parent 6e2ef53a72b981773830106822b17d1754dcf0a0
parent 32c82e4e757172d2cc065480ad0d78b816743fc8

Merge "Fix OTA info persistence logic" into pi-dev

services/devicepolicy/java/com/android/server/devicepolicy/Owners.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
index 0268519..8366114 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
@@ -723,6 +723,11 @@
                 mSystemUpdatePolicy.saveToXml(out);
                 out.endTag(null, TAG_SYSTEM_UPDATE_POLICY);
             }
+
+            if (mSystemUpdateInfo != null) {
+                mSystemUpdateInfo.writeToXml(out, TAG_PENDING_OTA_INFO);
+            }
+
             if (mSystemUpdateFreezeStart != null || mSystemUpdateFreezeEnd != null) {
                 out.startTag(null, TAG_FREEZE_PERIOD_RECORD);
                 if (mSystemUpdateFreezeStart != null) {