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

Commit bb2e05e9 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add descriptions to compat changes." am: b38db5af am: d54f52b9 am: 76ba40cc"

parents ca84670e 5ec4ac7d

core/java/com/android/internal/compat/CompatibilityChangeInfo.java

+10 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ public class CompatibilityChangeInfo implements Parcelable { 
    private final @Nullable String mName;

    private final int mEnableAfterTargetSdk;

    private final boolean mDisabled;

    private final @Nullable String mDescription;



    public long getId() {

        return mChangeId;
@@ -48,12 +49,18 @@ public class CompatibilityChangeInfo implements Parcelable { 
        return mDisabled;

    }



    public String getDescription()  {

        return mDescription;

    }



    public CompatibilityChangeInfo(

            Long changeId, String name, int enableAfterTargetSdk, boolean disabled) {

            Long changeId, String name, int enableAfterTargetSdk, boolean disabled,

            String description) {

        this.mChangeId = changeId;

        this.mName = name;

        this.mEnableAfterTargetSdk = enableAfterTargetSdk;

        this.mDisabled = disabled;

        this.mDescription = description;

    }



    private CompatibilityChangeInfo(Parcel in) {
@@ -61,6 +68,7 @@ public class CompatibilityChangeInfo implements Parcelable { 
        mName = in.readString();

        mEnableAfterTargetSdk = in.readInt();

        mDisabled = in.readBoolean();

        mDescription = in.readString();

    }



    @Override
@@ -74,6 +82,7 @@ public class CompatibilityChangeInfo implements Parcelable { 
        dest.writeString(mName);

        dest.writeInt(mEnableAfterTargetSdk);

        dest.writeBoolean(mDisabled);

        dest.writeString(mDescription);

    }



    public static final Parcelable.Creator<CompatibilityChangeInfo> CREATOR =

services/core/java/com/android/server/compat/CompatChange.java

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public final class CompatChange extends CompatibilityChangeInfo { 
    private Map<String, Boolean> mPackageOverrides;



    public CompatChange(long changeId) {

        this(changeId, null, -1, false);

        this(changeId, null, -1, false, null);

    }



    /**
@@ -66,8 +66,8 @@ public final class CompatChange extends CompatibilityChangeInfo { 
     * @param disabled If {@code true}, overrides any {@code enableAfterTargetSdk} set.

     */

    public CompatChange(long changeId, @Nullable String name, int enableAfterTargetSdk,

            boolean disabled) {

        super(changeId, name, enableAfterTargetSdk, disabled);

            boolean disabled, String description) {

        super(changeId, name, enableAfterTargetSdk, disabled, description);

    }



    /**
@@ -75,7 +75,7 @@ public final class CompatChange extends CompatibilityChangeInfo { 
     */

    public CompatChange(Change change) {

        super(change.getId(), change.getName(), change.getEnableAfterTargetSdk(),

                change.getDisabled());

                change.getDisabled(), change.getDescription());

    }



    void registerListener(ChangeListener listener) {

services/core/java/com/android/server/compat/CompatConfig.java

+2 −1
Original line number Diff line number Diff line
@@ -319,7 +319,8 @@ final class CompatConfig { 
                changeInfos[i] = new CompatibilityChangeInfo(change.getId(),

                        change.getName(),

                        change.getEnableAfterTargetSdk(),

                        change.getDisabled());

                        change.getDisabled(),

                        change.getDescription());

            }

            return changeInfos;

        }

services/core/xsd/platform-compat-config.xsd

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
                <xs:attribute type="xs:string" name="name" use="required"/>

                <xs:attribute type="xs:boolean" name="disabled"/>

                <xs:attribute type="xs:int" name="enableAfterTargetSdk"/>

                <xs:attribute type="xs:string" name="description"/>

            </xs:extension>

        </xs:simpleContent>

    </xs:complexType>

services/core/xsd/platform-compat-schema/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ package com.android.server.compat.config { 


  public class Change {

    ctor public Change();

    method public String getDescription();

    method public boolean getDisabled();

    method public int getEnableAfterTargetSdk();

    method public long getId();

    method public String getName();

    method public String getValue();

    method public void setDescription(String);

    method public void setDisabled(boolean);

    method public void setEnableAfterTargetSdk(int);

    method public void setId(long);