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

Commit fb6a8439 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Ensure device_owners2.xml is always written." into main

parents 1cd960cf aaa86cdf

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -236,6 +236,16 @@ flag { 
  bug: "323894620"

  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 {

flag {

  name: "is_recursive_required_app_merging_enabled"

  name: "is_recursive_required_app_merging_enabled"

  namespace: "enterprise"

  namespace: "enterprise"

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

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




        @Override

        @Override

        boolean shouldWrite() {

        boolean shouldWrite() {

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

            return Flags.alwaysPersistDo()

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

                    || (mSystemUpdateInfo != null);

                    || (mSystemUpdateInfo != null);

        }

        }