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

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

Merge "Cleanup always_persist_do" into main

parents 3a664fe7 9f50f62e

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

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

}



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

+1 −3
Original line number Diff line number Diff line
@@ -361,9 +361,7 @@ class OwnersData { 


        @Override

        boolean shouldWrite() {

            return Flags.alwaysPersistDo()

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

                    || (mSystemUpdateInfo != null);

            return true;

        }



        @Override