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

Commit aaa86cdf authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Ensure device_owners2.xml is always written. 

Bug: 335232744
Test: Manual, upgrading from T-QPR3
Change-Id: I7a7dba56f2951e7e3699b19d2517d198dc8f9d35
parent 993b89ab

core/java/android/app/admin/flags/flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -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"

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

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


        @Override

        boolean shouldWrite() {

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

            return Flags.alwaysPersistDo()

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

                    || (mSystemUpdateInfo != null);

        }