From aaa86cdfb79003fd66aae1132b9c06cfe80d7d08 Mon Sep 17 00:00:00 2001 From: Pavel Grafov 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 Change-Id: I7a7dba56f2951e7e3699b19d2517d198dc8f9d35 --- core/java/android/app/admin/flags/flags.aconfig | 10 ++++++++++ .../java/com/android/server/devicepolicy/OwnersData.java | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 6a07484eebc6..0eb67d16436c 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -227,6 +227,16 @@ flag { bug: "323894620" } +flag { + name: "always_persist_do" + namespace: "enterprise" + description: "Always write device_owners2.xml so that migration flags aren't lost" + bug: "335232744" + metadata { + purpose: PURPOSE_BUGFIX + } +} + flag { name: "is_recursive_required_app_merging_enabled" namespace: "enterprise" diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java index 42ac998bf96c..d02cfee72aa2 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java @@ -357,7 +357,8 @@ class OwnersData { @Override boolean shouldWrite() { - return (mDeviceOwner != null) || (mSystemUpdatePolicy != null) + return Flags.alwaysPersistDo() + || (mDeviceOwner != null) || (mSystemUpdatePolicy != null) || (mSystemUpdateInfo != null); } -- cgit v1.2.3-59-g8ed1b