From 2cdc66edfaed6849dc911ee106c0709c1ad3eb28 Mon Sep 17 00:00:00 2001
From: Pavel Grafov <pgrafov@google.com>
Date: Tue, 16 Apr 2024 18:28:16 +0100
Subject: Ensure device_owners2.xml is always written.

Bug: 335232744
Test: Manual, upgrading from T-QPR3
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3abc07421d5bed187589d6deb48da07e4c407203)
Merged-In: I7a7dba56f2951e7e3699b19d2517d198dc8f9d35
Change-Id: I7a7dba56f2951e7e3699b19d2517d198dc8f9d35
---
 .../devicepolicy/java/com/android/server/devicepolicy/OwnersData.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java
index 608ae140450e..2ced224091a0 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java
@@ -354,8 +354,7 @@ class OwnersData {
 
         @Override
         boolean shouldWrite() {
-            return (mDeviceOwner != null) || (mSystemUpdatePolicy != null)
-                    || (mSystemUpdateInfo != null);
+            return true;
         }
 
         @Override
-- 
cgit v1.2.3