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

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

Merge "Remove unused argument" into main

parents 706ca389 c9e22061

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

+1 −3
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.BooleanPolicyValue;

import android.app.admin.PolicyKey;

import android.util.Log;



import com.android.modules.utils.TypedXmlPullParser;
@@ -37,8 +36,7 @@ final class BooleanPolicySerializer extends PolicySerializer<Boolean> { 
    private static final String TAG = "BooleanPolicySerializer";



    @Override

    void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull Boolean value)

            throws IOException {

    void saveToXml(TypedXmlSerializer serializer, @NonNull Boolean value) throws IOException {

        Objects.requireNonNull(value);

        serializer.attributeBoolean(/* namespace= */ null, ATTR_VALUE, value);

    }

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

+1 −9
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.server.devicepolicy; 


import android.annotation.NonNull;

import android.app.admin.BundlePolicyValue;

import android.app.admin.PackagePolicyKey;

import android.app.admin.PolicyKey;

import android.os.Bundle;

import android.os.Parcelable;

import android.util.Log;
@@ -53,14 +51,8 @@ final class BundlePolicySerializer extends PolicySerializer<Bundle> { 
    private static final String ATTR_TYPE_BUNDLE_ARRAY = "BA";



    @Override

    void saveToXml(@NonNull PolicyKey policyKey, TypedXmlSerializer serializer,

            @NonNull Bundle value) throws IOException {

    void saveToXml(TypedXmlSerializer serializer, @NonNull Bundle value) throws IOException {

        Objects.requireNonNull(value);

        Objects.requireNonNull(policyKey);

        if (!(policyKey instanceof PackagePolicyKey)) {

            throw new IllegalArgumentException("policyKey is not of type "

                    + "PackagePolicyKey");

        }

        writeBundle(value, serializer);

    }

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

+1 −3
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.ComponentNamePolicyValue;

import android.app.admin.PolicyKey;

import android.content.ComponentName;

import android.util.Log;
@@ -37,8 +36,7 @@ final class ComponentNamePolicySerializer extends PolicySerializer<ComponentName 
    private static final String ATTR_CLASS_NAME = "class-name";



    @Override

    void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer,

            @NonNull ComponentName value) throws IOException {

    void saveToXml(TypedXmlSerializer serializer, @NonNull ComponentName value) throws IOException {

        Objects.requireNonNull(value);

        serializer.attribute(

                /* namespace= */ null, ATTR_PACKAGE_NAME, value.getPackageName());

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

+1 −3
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.IntegerPolicyValue;

import android.app.admin.PolicyKey;

import android.util.Log;



import com.android.modules.utils.TypedXmlPullParser;
@@ -37,8 +36,7 @@ final class IntegerPolicySerializer extends PolicySerializer<Integer> { 
    private static final String ATTR_VALUE = "value";



    @Override

    void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer,

            @NonNull Integer value) throws IOException {

    void saveToXml(TypedXmlSerializer serializer, @NonNull Integer value) throws IOException {

        Objects.requireNonNull(value);

        serializer.attributeInt(/* namespace= */ null, ATTR_VALUE, value);

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.devicepolicy; 


import android.annotation.NonNull;

import android.app.admin.LockTaskPolicy;

import android.app.admin.PolicyKey;

import android.util.Log;



import com.android.modules.utils.TypedXmlPullParser;
@@ -39,8 +38,8 @@ final class LockTaskPolicySerializer extends PolicySerializer<LockTaskPolicy> { 
    private static final String ATTR_FLAGS = "flags";



    @Override

    void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer,

            @NonNull LockTaskPolicy value) throws IOException {

    void saveToXml(TypedXmlSerializer serializer, @NonNull LockTaskPolicy value)

            throws IOException {

        Objects.requireNonNull(value);

        serializer.attribute(

                /* namespace= */ null,