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

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

Merge "Clean up dont_write_policy_definition" into main

parents 7a740936 e264c9ed

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

+0 −10
Original line number Diff line number Diff line
@@ -342,16 +342,6 @@ 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: "active_admin_cleanup"

    namespace: "enterprise"

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

+0 −4
Original line number Diff line number Diff line
@@ -672,10 +672,6 @@ final class PolicyDefinition<V> { 
        }

    }



    void saveToXml(TypedXmlSerializer serializer) throws IOException {

        mPolicyKey.saveToXml(serializer);

    }



    @Nullable

    static <V> PolicyDefinition<V> readFromXml(TypedXmlPullParser parser)

            throws XmlPullParserException, IOException {

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

+0 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 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;
@@ -41,7 +40,6 @@ final class PolicyState<V> { 
    private static final String TAG = "PolicyState";

    private static final String TAG_ADMIN_POLICY_ENTRY = "admin-policy-entry";



    private static final String TAG_POLICY_DEFINITION_ENTRY = "policy-definition-entry";

    private static final String TAG_RESOLVED_VALUE_ENTRY = "resolved-value-entry";

    private static final String TAG_ENFORCING_ADMIN_ENTRY = "enforcing-admin-entry";

    private static final String TAG_POLICY_VALUE_ENTRY = "policy-value-entry";
@@ -225,12 +223,6 @@ 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);

            mPolicyDefinition.savePolicyValueToXml(