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

Commit 81a19959 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Don't write policy definition within policy state 

Policy definition is obtained from <policy-key-entry> by DPE.readPoliciesInner

Bug: 335663055
Test: manual
Flag: android.app.admin.flags.dont_write_policy_definition
Change-Id: Ia0bbdccbc588101a840e709fc2d8d48bf1d5cf72
parent cc22fa54

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

+10 −0
Original line number Diff line number Diff line
@@ -322,6 +322,16 @@ flag { 
    }

}



flag {

    name: "dont_write_policy_definition"

    namespace: "enterprise"

    description: "Don't write redundant policy-definition-entry tags"

    bug: "335663055"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

  name: "user_provisioning_same_state"

  namespace: "enterprise"

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

+6 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.devicepolicy; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.admin.PolicyValue;

import android.app.admin.flags.Flags;

import android.util.IndentingPrintWriter;



import com.android.internal.util.XmlUtils;
@@ -224,9 +225,11 @@ final class PolicyState<V> { 
    }



    void saveToXml(TypedXmlSerializer serializer) throws IOException {

        if (!Flags.dontWritePolicyDefinition()) {

            serializer.startTag(/* namespace= */ null, TAG_POLICY_DEFINITION_ENTRY);

            mPolicyDefinition.saveToXml(serializer);

            serializer.endTag(/* namespace= */ null, TAG_POLICY_DEFINITION_ENTRY);

        }



        if (mCurrentResolvedPolicy != null) {

            serializer.startTag(/* namespace= */ null, TAG_RESOLVED_VALUE_ENTRY);