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

Commit b401b82d authored by Winson's avatar Winson
Browse files

Split ParsedProcessImpl 

Bug: 178218967

Change-Id: I1d236b0dcd65ec8d50ad668e5c4351404c8a1e8a
parent 1293ee75

core/java/android/content/pm/parsing/component/ComponentMutateUtils.java

+5 −0
Original line number Diff line number Diff line
@@ -90,4 +90,9 @@ public class ComponentMutateUtils { 
            int priority) {

        ((ParsedPermissionGroupImpl) parsedPermissionGroup).setPriority(priority);

    }



    public static void addStateFrom(@NonNull ParsedProcess oldProcess,

            @NonNull ParsedProcess newProcess) {

        ((ParsedProcessImpl) oldProcess).addStateFrom(newProcess);

    }

}

core/java/android/content/pm/parsing/component/ParsedProcess.java

+9 −222
Original line number Diff line number Diff line
@@ -16,240 +16,27 @@ 


package android.content.pm.parsing.component;



import static java.util.Collections.emptySet;



import android.annotation.NonNull;

import android.content.pm.ApplicationInfo;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.ArraySet;



import com.android.internal.util.CollectionUtils;

import com.android.internal.util.DataClass;

import com.android.internal.util.Parcelling;



import java.util.Set;



/** @hide */

@DataClass(genGetters = true, genSetters = true, genParcelable = true, genAidl = false,

        genBuilder = false)

public class ParsedProcess implements Parcelable {

public interface ParsedProcess extends Parcelable {



    @NonNull

    private String name;

    @NonNull

    @DataClass.ParcelWith(Parcelling.BuiltIn.ForInternedStringSet.class)

    private Set<String> deniedPermissions = emptySet();

    Set<String> getDeniedPermissions();



    @ApplicationInfo.GwpAsanMode

    private int gwpAsanMode = ApplicationInfo.GWP_ASAN_DEFAULT;

    @ApplicationInfo.MemtagMode

    private int memtagMode = ApplicationInfo.MEMTAG_DEFAULT;

    @ApplicationInfo.NativeHeapZeroInitialized

    private int nativeHeapZeroInitialized = ApplicationInfo.ZEROINIT_DEFAULT;



    public ParsedProcess() {

    }



    public ParsedProcess(@NonNull ParsedProcess other) {

        name = other.name;

        deniedPermissions = new ArraySet<>(other.deniedPermissions);

    }



    public void addStateFrom(@NonNull ParsedProcess other) {

        deniedPermissions = CollectionUtils.addAll(deniedPermissions, other.deniedPermissions);

    }







    // Code below generated by codegen v1.0.23.

    //

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    //

    // To regenerate run:

    // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/parsing/component/ParsedProcess.java

    //

    // To exclude the generated code from IntelliJ auto-formatting enable (one-time):

    //   Settings > Editor > Code Style > Formatter Control

    //@formatter:off





    @DataClass.Generated.Member

    public ParsedProcess(

            @NonNull String name,

            @NonNull Set<String> deniedPermissions,

            @ApplicationInfo.GwpAsanMode int gwpAsanMode,

            @ApplicationInfo.MemtagMode int memtagMode,

            @ApplicationInfo.NativeHeapZeroInitialized int nativeHeapZeroInitialized) {

        this.name = name;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, name);

        this.deniedPermissions = deniedPermissions;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, deniedPermissions);

        this.gwpAsanMode = gwpAsanMode;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.GwpAsanMode.class, null, gwpAsanMode);

        this.memtagMode = memtagMode;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.MemtagMode.class, null, memtagMode);

        this.nativeHeapZeroInitialized = nativeHeapZeroInitialized;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.NativeHeapZeroInitialized.class, null, nativeHeapZeroInitialized);



        // onConstructed(); // You can define this method to get a callback

    }



    @DataClass.Generated.Member

    public @NonNull String getName() {

        return name;

    }



    @DataClass.Generated.Member

    public @NonNull Set<String> getDeniedPermissions() {

        return deniedPermissions;

    }



    @DataClass.Generated.Member

    public @ApplicationInfo.GwpAsanMode int getGwpAsanMode() {

        return gwpAsanMode;

    }



    @DataClass.Generated.Member

    public @ApplicationInfo.MemtagMode int getMemtagMode() {

        return memtagMode;

    }



    @DataClass.Generated.Member

    public @ApplicationInfo.NativeHeapZeroInitialized int getNativeHeapZeroInitialized() {

        return nativeHeapZeroInitialized;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcess setName(@NonNull String value) {

        name = value;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, name);

        return this;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcess setDeniedPermissions(@NonNull Set<String> value) {

        deniedPermissions = value;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, deniedPermissions);

        return this;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcess setGwpAsanMode(@ApplicationInfo.GwpAsanMode int value) {

        gwpAsanMode = value;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.GwpAsanMode.class, null, gwpAsanMode);

        return this;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcess setMemtagMode(@ApplicationInfo.MemtagMode int value) {

        memtagMode = value;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.MemtagMode.class, null, memtagMode);

        return this;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcess setNativeHeapZeroInitialized(@ApplicationInfo.NativeHeapZeroInitialized int value) {

        nativeHeapZeroInitialized = value;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.NativeHeapZeroInitialized.class, null, nativeHeapZeroInitialized);

        return this;

    }



    @DataClass.Generated.Member

    static Parcelling<Set<String>> sParcellingForDeniedPermissions =

            Parcelling.Cache.get(

                    Parcelling.BuiltIn.ForInternedStringSet.class);

    static {

        if (sParcellingForDeniedPermissions == null) {

            sParcellingForDeniedPermissions = Parcelling.Cache.put(

                    new Parcelling.BuiltIn.ForInternedStringSet());

        }

    }



    @Override

    @DataClass.Generated.Member

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        // You can override field parcelling by defining methods like:

        // void parcelFieldName(Parcel dest, int flags) { ... }



        dest.writeString(name);

        sParcellingForDeniedPermissions.parcel(deniedPermissions, dest, flags);

        dest.writeInt(gwpAsanMode);

        dest.writeInt(memtagMode);

        dest.writeInt(nativeHeapZeroInitialized);

    }



    @Override

    @DataClass.Generated.Member

    public int describeContents() { return 0; }



    /** @hide */

    @SuppressWarnings({"unchecked", "RedundantCast"})

    @DataClass.Generated.Member

    protected ParsedProcess(@NonNull Parcel in) {

        // You can override field unparcelling by defining methods like:

        // static FieldType unparcelFieldName(Parcel in) { ... }



        String _name = in.readString();

        Set<String> _deniedPermissions = sParcellingForDeniedPermissions.unparcel(in);

        int _gwpAsanMode = in.readInt();

        int _memtagMode = in.readInt();

        int _nativeHeapZeroInitialized = in.readInt();



        this.name = _name;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, name);

        this.deniedPermissions = _deniedPermissions;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, deniedPermissions);

        this.gwpAsanMode = _gwpAsanMode;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.GwpAsanMode.class, null, gwpAsanMode);

        this.memtagMode = _memtagMode;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.MemtagMode.class, null, memtagMode);

        this.nativeHeapZeroInitialized = _nativeHeapZeroInitialized;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.NativeHeapZeroInitialized.class, null, nativeHeapZeroInitialized);



        // onConstructed(); // You can define this method to get a callback

    }



    @DataClass.Generated.Member

    public static final @NonNull Parcelable.Creator<ParsedProcess> CREATOR

            = new Parcelable.Creator<ParsedProcess>() {

        @Override

        public ParsedProcess[] newArray(int size) {

            return new ParsedProcess[size];

        }



        @Override

        public ParsedProcess createFromParcel(@NonNull Parcel in) {

            return new ParsedProcess(in);

        }

    };



    @DataClass.Generated(

            time = 1623692988845L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/content/pm/parsing/component/ParsedProcess.java",

            inputSignatures = "private @android.annotation.NonNull java.lang.String name\nprivate @android.annotation.NonNull @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedStringSet.class) java.util.Set<java.lang.String> deniedPermissions\nprivate @android.content.pm.ApplicationInfo.GwpAsanMode int gwpAsanMode\nprivate @android.content.pm.ApplicationInfo.MemtagMode int memtagMode\nprivate @android.content.pm.ApplicationInfo.NativeHeapZeroInitialized int nativeHeapZeroInitialized\npublic  void addStateFrom(android.content.pm.parsing.component.ParsedProcess)\nclass ParsedProcess extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genGetters=true, genSetters=true, genParcelable=true, genAidl=false, genBuilder=false)")

    @Deprecated

    private void __metadata() {}

    int getGwpAsanMode();



    @ApplicationInfo.MemtagMode

    int getMemtagMode();



    //@formatter:on

    // End of generated code

    @NonNull

    String getName();



    @ApplicationInfo.NativeHeapZeroInitialized

    int getNativeHeapZeroInitialized();

}

core/java/android/content/pm/parsing/component/ParsedProcessImpl.java

0 → 100644
+263 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.content.pm.parsing.component;



import static java.util.Collections.emptySet;



import android.annotation.NonNull;

import android.content.pm.ApplicationInfo;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.ArraySet;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.CollectionUtils;

import com.android.internal.util.DataClass;

import com.android.internal.util.Parcelling;



import java.util.Set;



/** @hide */

@DataClass(genGetters = true, genSetters = true, genParcelable = true, genAidl = false,

        genBuilder = false)

@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

public class ParsedProcessImpl implements ParsedProcess {



    @NonNull

    private String name;

    @NonNull

    @DataClass.ParcelWith(Parcelling.BuiltIn.ForInternedStringSet.class)

    private Set<String> deniedPermissions = emptySet();



    @ApplicationInfo.GwpAsanMode

    private int gwpAsanMode = ApplicationInfo.GWP_ASAN_DEFAULT;

    @ApplicationInfo.MemtagMode

    private int memtagMode = ApplicationInfo.MEMTAG_DEFAULT;

    @ApplicationInfo.NativeHeapZeroInitialized

    private int nativeHeapZeroInitialized = ApplicationInfo.ZEROINIT_DEFAULT;



    public ParsedProcessImpl() {

    }



    public ParsedProcessImpl(@NonNull ParsedProcess other) {

        name = other.getName();

        deniedPermissions = new ArraySet<>(other.getDeniedPermissions());

        gwpAsanMode = other.getGwpAsanMode();

        memtagMode = other.getMemtagMode();

        nativeHeapZeroInitialized = other.getNativeHeapZeroInitialized();

    }



    public void addStateFrom(@NonNull ParsedProcess other) {

        deniedPermissions = CollectionUtils.addAll(deniedPermissions, other.getDeniedPermissions());

        gwpAsanMode = other.getGwpAsanMode();

        memtagMode = other.getMemtagMode();

        nativeHeapZeroInitialized = other.getNativeHeapZeroInitialized();

    }







    // Code below generated by codegen v1.0.23.

    //

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    //

    // To regenerate run:

    // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/parsing/component/ParsedProcessImpl.java

    //

    // To exclude the generated code from IntelliJ auto-formatting enable (one-time):

    //   Settings > Editor > Code Style > Formatter Control

    //@formatter:off





    @DataClass.Generated.Member

    public ParsedProcessImpl(

            @NonNull String name,

            @NonNull Set<String> deniedPermissions,

            @ApplicationInfo.GwpAsanMode int gwpAsanMode,

            @ApplicationInfo.MemtagMode int memtagMode,

            @ApplicationInfo.NativeHeapZeroInitialized int nativeHeapZeroInitialized) {

        this.name = name;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, name);

        this.deniedPermissions = deniedPermissions;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, deniedPermissions);

        this.gwpAsanMode = gwpAsanMode;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.GwpAsanMode.class, null, gwpAsanMode);

        this.memtagMode = memtagMode;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.MemtagMode.class, null, memtagMode);

        this.nativeHeapZeroInitialized = nativeHeapZeroInitialized;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.NativeHeapZeroInitialized.class, null, nativeHeapZeroInitialized);



        // onConstructed(); // You can define this method to get a callback

    }



    @DataClass.Generated.Member

    public @NonNull String getName() {

        return name;

    }



    @DataClass.Generated.Member

    public @NonNull Set<String> getDeniedPermissions() {

        return deniedPermissions;

    }



    @DataClass.Generated.Member

    public @ApplicationInfo.GwpAsanMode int getGwpAsanMode() {

        return gwpAsanMode;

    }



    @DataClass.Generated.Member

    public @ApplicationInfo.MemtagMode int getMemtagMode() {

        return memtagMode;

    }



    @DataClass.Generated.Member

    public @ApplicationInfo.NativeHeapZeroInitialized int getNativeHeapZeroInitialized() {

        return nativeHeapZeroInitialized;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcessImpl setName(@NonNull String value) {

        name = value;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, name);

        return this;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcessImpl setDeniedPermissions(@NonNull Set<String> value) {

        deniedPermissions = value;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, deniedPermissions);

        return this;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcessImpl setGwpAsanMode(@ApplicationInfo.GwpAsanMode int value) {

        gwpAsanMode = value;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.GwpAsanMode.class, null, gwpAsanMode);

        return this;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcessImpl setMemtagMode(@ApplicationInfo.MemtagMode int value) {

        memtagMode = value;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.MemtagMode.class, null, memtagMode);

        return this;

    }



    @DataClass.Generated.Member

    public @NonNull ParsedProcessImpl setNativeHeapZeroInitialized(@ApplicationInfo.NativeHeapZeroInitialized int value) {

        nativeHeapZeroInitialized = value;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.NativeHeapZeroInitialized.class, null, nativeHeapZeroInitialized);

        return this;

    }



    @DataClass.Generated.Member

    static Parcelling<Set<String>> sParcellingForDeniedPermissions =

            Parcelling.Cache.get(

                    Parcelling.BuiltIn.ForInternedStringSet.class);

    static {

        if (sParcellingForDeniedPermissions == null) {

            sParcellingForDeniedPermissions = Parcelling.Cache.put(

                    new Parcelling.BuiltIn.ForInternedStringSet());

        }

    }



    @Override

    @DataClass.Generated.Member

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        // You can override field parcelling by defining methods like:

        // void parcelFieldName(Parcel dest, int flags) { ... }



        dest.writeString(name);

        sParcellingForDeniedPermissions.parcel(deniedPermissions, dest, flags);

        dest.writeInt(gwpAsanMode);

        dest.writeInt(memtagMode);

        dest.writeInt(nativeHeapZeroInitialized);

    }



    @Override

    @DataClass.Generated.Member

    public int describeContents() { return 0; }



    /** @hide */

    @SuppressWarnings({"unchecked", "RedundantCast"})

    @DataClass.Generated.Member

    protected ParsedProcessImpl(@NonNull Parcel in) {

        // You can override field unparcelling by defining methods like:

        // static FieldType unparcelFieldName(Parcel in) { ... }



        String _name = in.readString();

        Set<String> _deniedPermissions = sParcellingForDeniedPermissions.unparcel(in);

        int _gwpAsanMode = in.readInt();

        int _memtagMode = in.readInt();

        int _nativeHeapZeroInitialized = in.readInt();



        this.name = _name;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, name);

        this.deniedPermissions = _deniedPermissions;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, deniedPermissions);

        this.gwpAsanMode = _gwpAsanMode;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.GwpAsanMode.class, null, gwpAsanMode);

        this.memtagMode = _memtagMode;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.MemtagMode.class, null, memtagMode);

        this.nativeHeapZeroInitialized = _nativeHeapZeroInitialized;

        com.android.internal.util.AnnotationValidations.validate(

                ApplicationInfo.NativeHeapZeroInitialized.class, null, nativeHeapZeroInitialized);



        // onConstructed(); // You can define this method to get a callback

    }



    @DataClass.Generated.Member

    public static final @NonNull Parcelable.Creator<ParsedProcessImpl> CREATOR

            = new Parcelable.Creator<ParsedProcessImpl>() {

        @Override

        public ParsedProcessImpl[] newArray(int size) {

            return new ParsedProcessImpl[size];

        }



        @Override

        public ParsedProcessImpl createFromParcel(@NonNull Parcel in) {

            return new ParsedProcessImpl(in);

        }

    };



    @DataClass.Generated(

            time = 1627605368434L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/content/pm/parsing/component/ParsedProcessImpl.java",

            inputSignatures = "private @android.annotation.NonNull java.lang.String name\nprivate @android.annotation.NonNull @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedStringSet.class) java.util.Set<java.lang.String> deniedPermissions\nprivate @android.content.pm.ApplicationInfo.GwpAsanMode int gwpAsanMode\nprivate @android.content.pm.ApplicationInfo.MemtagMode int memtagMode\nprivate @android.content.pm.ApplicationInfo.NativeHeapZeroInitialized int nativeHeapZeroInitialized\npublic  void addStateFrom(android.content.pm.parsing.component.ParsedProcess)\nclass ParsedProcessImpl extends java.lang.Object implements [android.content.pm.parsing.component.ParsedProcess]\n@com.android.internal.util.DataClass(genGetters=true, genSetters=true, genParcelable=true, genAidl=false, genBuilder=false)")

    @Deprecated

    private void __metadata() {}





    //@formatter:on

    // End of generated code



}

core/java/android/content/pm/parsing/component/ParsedProcessUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class ParsedProcessUtils { 
    private static ParseResult<ParsedProcess> parseProcess(Set<String> perms, String[] separateProcesses,

            ParsingPackage pkg, Resources res, XmlResourceParser parser, int flags,

            ParseInput input) throws IOException, XmlPullParserException {

        ParsedProcess proc = new ParsedProcess();

        ParsedProcessImpl proc = new ParsedProcessImpl();

        TypedArray sa = res.obtainAttributes(parser, R.styleable.AndroidManifestProcess);

        try {

            if (perms != null) {

services/core/java/com/android/server/pm/SharedUserSetting.java

+5 −5
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ package com.android.server.pm; 


import android.annotation.NonNull;

import android.content.pm.ApplicationInfo;

import android.content.pm.parsing.component.ComponentMutateUtils;

import android.content.pm.parsing.component.ParsedProcess;

import android.content.pm.parsing.component.ParsedProcessImpl;

import android.service.pm.PackageServiceDumpProto;

import android.util.ArrayMap;

import android.util.ArraySet;
@@ -126,15 +128,14 @@ public final class SharedUserSetting extends SettingBase { 


    void addProcesses(Map<String, ParsedProcess> newProcs) {

        if (newProcs != null) {

            final int numProcs = newProcs.size();

            for (String key : newProcs.keySet()) {

                ParsedProcess newProc = newProcs.get(key);

                ParsedProcess proc = processes.get(newProc.getName());

                if (proc == null) {

                    proc = new ParsedProcess(newProc);

                    proc = new ParsedProcessImpl(newProc);

                    processes.put(newProc.getName(), proc);

                } else {

                    proc.addStateFrom(newProc);

                    ComponentMutateUtils.addStateFrom(proc, newProc);

                }

            }

            onChanged();
@@ -280,8 +281,7 @@ public final class SharedUserSetting extends SettingBase { 
            this.processes.clear();

            this.processes.ensureCapacity(numProcs);

            for (int i = 0; i < numProcs; i++) {

                ParsedProcess proc =

                        new ParsedProcess(sharedUser.processes.valueAt(i));

                ParsedProcess proc = new ParsedProcessImpl(sharedUser.processes.valueAt(i));

                this.processes.put(proc.getName(), proc);

            }

        } else {