| commit | 58f14f7e586877db99ea483fae7275896009537d | [log] [tgz] |
|---|---|---|
| author | Pavel Grafov <pgrafov@google.com> | Tue Apr 16 18:28:16 2024 +0100 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Jul 01 15:25:50 2024 +0000 |
| tree | 77dc5bb68fa99a6bc282e3d7282bfd910fd66d91 | |
| parent | ec923ae4732b0344efe76a8dedde3a76c824e03c [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 24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java index 42ac998..ad50116 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java
@@ -357,8 +357,7 @@ @Override boolean shouldWrite() { - return (mDeviceOwner != null) || (mSystemUpdatePolicy != null) - || (mSystemUpdateInfo != null); + return true; } @Override