Merge "Ensure device_owners2.xml is always written." into udc-dev

f3d825f0 · Treehugger Robot · Android (Google) Code Review · ca0c29f0 · 3abc0742 · f3d825f0
Commit f3d825f0 authored 10 months ago by Treehugger Robot Committed by Android (Google) Code Review 10 months ago
--- 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