Merge "Add descriptions to compat changes." am: b38db5afe0 (76ba40cc) · Commits · e / os / android_frameworks_base

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

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ public class CompatibilityChangeInfo implements Parcelable {
	private final @Nullable String mName;		private final @Nullable String mName;
	private final int mEnableAfterTargetSdk;		private final int mEnableAfterTargetSdk;
	private final boolean mDisabled;		private final boolean mDisabled;
			private final @Nullable String mDescription;

	public long getId() {		public long getId() {
	return mChangeId;		return mChangeId;
	@@ -48,12 +49,18 @@ public class CompatibilityChangeInfo implements Parcelable {
	return mDisabled;		return mDisabled;
	}		}

			public String getDescription() {
			return mDescription;
			}

	public CompatibilityChangeInfo(		public CompatibilityChangeInfo(
	Long changeId, String name, int enableAfterTargetSdk, boolean disabled) {		Long changeId, String name, int enableAfterTargetSdk, boolean disabled,
			String description) {
	this.mChangeId = changeId;		this.mChangeId = changeId;
	this.mName = name;		this.mName = name;
	this.mEnableAfterTargetSdk = enableAfterTargetSdk;		this.mEnableAfterTargetSdk = enableAfterTargetSdk;
	this.mDisabled = disabled;		this.mDisabled = disabled;
			this.mDescription = description;
	}		}

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

	@Override		@Override
	@@ -74,6 +82,7 @@ public class CompatibilityChangeInfo implements Parcelable {
	dest.writeString(mName);		dest.writeString(mName);
	dest.writeInt(mEnableAfterTargetSdk);		dest.writeInt(mEnableAfterTargetSdk);
	dest.writeBoolean(mDisabled);		dest.writeBoolean(mDisabled);
			dest.writeString(mDescription);
	}		}

	public static final Parcelable.Creator<CompatibilityChangeInfo> CREATOR =		public static final Parcelable.Creator<CompatibilityChangeInfo> CREATOR =

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

+4 −4

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

	public CompatChange(long changeId) {		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.		* @param disabled If {@code true}, overrides any {@code enableAfterTargetSdk} set.
	*/		*/
	public CompatChange(long changeId, @Nullable String name, int enableAfterTargetSdk,		public CompatChange(long changeId, @Nullable String name, int enableAfterTargetSdk,
	boolean disabled) {		boolean disabled, String description) {
	super(changeId, name, enableAfterTargetSdk, disabled);		super(changeId, name, enableAfterTargetSdk, disabled, description);
	}		}

	/**		/**
	@@ -75,7 +75,7 @@ public final class CompatChange extends CompatibilityChangeInfo {
	*/		*/
	public CompatChange(Change change) {		public CompatChange(Change change) {
	super(change.getId(), change.getName(), change.getEnableAfterTargetSdk(),		super(change.getId(), change.getName(), change.getEnableAfterTargetSdk(),
	change.getDisabled());		change.getDisabled(), change.getDescription());
	}		}

	void registerListener(ChangeListener listener) {		void registerListener(ChangeListener listener) {

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -319,7 +319,8 @@ final class CompatConfig {
	changeInfos[i] = new CompatibilityChangeInfo(change.getId(),		changeInfos[i] = new CompatibilityChangeInfo(change.getId(),
	change.getName(),		change.getName(),
	change.getEnableAfterTargetSdk(),		change.getEnableAfterTargetSdk(),
	change.getDisabled());		change.getDisabled(),
			change.getDescription());
	}		}
	return changeInfos;		return changeInfos;
	}		}

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@
	<xs:attribute type="xs:string" name="name" use="required"/>		<xs:attribute type="xs:string" name="name" use="required"/>
	<xs:attribute type="xs:boolean" name="disabled"/>		<xs:attribute type="xs:boolean" name="disabled"/>
	<xs:attribute type="xs:int" name="enableAfterTargetSdk"/>		<xs:attribute type="xs:int" name="enableAfterTargetSdk"/>
			<xs:attribute type="xs:string" name="description"/>
	</xs:extension>		</xs:extension>
	</xs:simpleContent>		</xs:simpleContent>
	</xs:complexType>		</xs:complexType>

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

+2 −0

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

	public class Change {		public class Change {
	ctor public Change();		ctor public Change();
			method public String getDescription();
	method public boolean getDisabled();		method public boolean getDisabled();
	method public int getEnableAfterTargetSdk();		method public int getEnableAfterTargetSdk();
	method public long getId();		method public long getId();
	method public String getName();		method public String getName();
	method public String getValue();		method public String getValue();
			method public void setDescription(String);
	method public void setDisabled(boolean);		method public void setDisabled(boolean);
	method public void setEnableAfterTargetSdk(int);		method public void setEnableAfterTargetSdk(int);
	method public void setId(long);		method public void setId(long);