From 32c82e4e757172d2cc065480ad0d78b816743fc8 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Mon, 26 Mar 2018 17:24:08 +0100 Subject: [PATCH] Fix OTA info persistence logic Code to persist OTA info was accidentally removed by a previous CL. Add it back. Bug: 73505100 Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testPendingSystemUpdate Change-Id: I9eba522641fd8f95cd6af32431498c2c8ac5ff0e --- .../java/com/android/server/devicepolicy/Owners.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java index 0268519795ba8..8366114892008 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 @@ class Owners { 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) {