Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23ed5da1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure device_owners2.xml is always written." into udc-dev am: f3d825f0 am: f6819907 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27263999



Change-Id: Ie5f3bd1660fe4a37d7ac433ffc5999d2b27efa21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d884f339 f6819907

services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java

+1 −2
Original line number Diff line number Diff line
@@ -354,8 +354,7 @@ class OwnersData { 


        @Override

        boolean shouldWrite() {

            return (mDeviceOwner != null) || (mSystemUpdatePolicy != null)

                    || (mSystemUpdateInfo != null);

            return true;

        }



        @Override