diff options
| author | Pavel Grafov <pgrafov@google.com> | 2024-04-16 18:28:16 +0100 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-06-18 03:26:52 +0000 |
| commit | 2cdc66edfaed6849dc911ee106c0709c1ad3eb28 (patch) | |
| tree | cce68dc6c4f9dd72f13cbf2e586bd654a92a701d | |
| parent | 62d324e0e5382388b284e9b1d1ced228f2077fc4 (diff) | |
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
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java | 3 |
1 files changed, 1 insertions, 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 |