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

Commit 060526f9 authored Feb 27, 2012 by James Dong

Deprecate default constructor for classes that should have been meant to be interfaces

o We should have not exposed these default constructors in the first place.

Change-Id: Ia8bcfe77e9730021ad8870ece67c6d0eed8146ad

parent fd400f5f

api/current.txt

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -7616,11 +7616,11 @@ package android.drm {
	}		}

	public class DrmStore {		public class DrmStore {
	ctor public DrmStore();		ctor public deprecated DrmStore();
	}		}

	public static class DrmStore.Action {		public static class DrmStore.Action {
	ctor public DrmStore.Action();		ctor public deprecated DrmStore.Action();
	field public static final int DEFAULT = 0; // 0x0		field public static final int DEFAULT = 0; // 0x0
	field public static final int DISPLAY = 7; // 0x7		field public static final int DISPLAY = 7; // 0x7
	field public static final int EXECUTE = 6; // 0x6		field public static final int EXECUTE = 6; // 0x6
	@@ -7641,7 +7641,7 @@ package android.drm {
	}		}

	public static class DrmStore.DrmObjectType {		public static class DrmStore.DrmObjectType {
	ctor public DrmStore.DrmObjectType();		ctor public deprecated DrmStore.DrmObjectType();
	field public static final int CONTENT = 1; // 0x1		field public static final int CONTENT = 1; // 0x1
	field public static final int RIGHTS_OBJECT = 2; // 0x2		field public static final int RIGHTS_OBJECT = 2; // 0x2
	field public static final int TRIGGER_OBJECT = 3; // 0x3		field public static final int TRIGGER_OBJECT = 3; // 0x3
	@@ -7649,7 +7649,7 @@ package android.drm {
	}		}

	public static class DrmStore.Playback {		public static class DrmStore.Playback {
	ctor public DrmStore.Playback();		ctor public deprecated DrmStore.Playback();
	field public static final int PAUSE = 2; // 0x2		field public static final int PAUSE = 2; // 0x2
	field public static final int RESUME = 3; // 0x3		field public static final int RESUME = 3; // 0x3
	field public static final int START = 0; // 0x0		field public static final int START = 0; // 0x0
	@@ -7657,7 +7657,7 @@ package android.drm {
	}		}

	public static class DrmStore.RightsStatus {		public static class DrmStore.RightsStatus {
	ctor public DrmStore.RightsStatus();		ctor public deprecated DrmStore.RightsStatus();
	field public static final int RIGHTS_EXPIRED = 2; // 0x2		field public static final int RIGHTS_EXPIRED = 2; // 0x2
	field public static final int RIGHTS_INVALID = 1; // 0x1		field public static final int RIGHTS_INVALID = 1; // 0x1
	field public static final int RIGHTS_NOT_ACQUIRED = 3; // 0x3		field public static final int RIGHTS_NOT_ACQUIRED = 3; // 0x3

drm/java/android/drm/DrmStore.java

+30 −0

Original line number	Original line	Diff line number	Diff line
	@@ -108,6 +108,12 @@ public class DrmStore {
	* A trigger information object type.		* A trigger information object type.
	*/		*/
	public static final int TRIGGER_OBJECT = 0x03;		public static final int TRIGGER_OBJECT = 0x03;

			/**
			* @deprecated This class should have been an interface instead.
			* The default constuctor should have not been exposed.
			*/
			public DrmObjectType() {}
	}		}

	/**		/**
	@@ -143,6 +149,12 @@ public class DrmStore {
	}		}
	return isValid;		return isValid;
	}		}

			/**
			* @deprecated This class should have been an interface instead.
			* The default constuctor should have not been exposed.
			*/
			public Playback() {}
	}		}

	/**		/**
	@@ -198,6 +210,12 @@ public class DrmStore {
	}		}
	return isValid;		return isValid;
	}		}

			/**
			* @deprecated This class should have been an interface instead.
			* The default constuctor should have not been exposed.
			*/
			public Action() {}
	}		}

	/**		/**
	@@ -220,6 +238,18 @@ public class DrmStore {
	* The digital rights have not been acquired for the rights-protected content.		* The digital rights have not been acquired for the rights-protected content.
	*/		*/
	public static final int RIGHTS_NOT_ACQUIRED = 0x03;		public static final int RIGHTS_NOT_ACQUIRED = 0x03;

			/**
			* @deprecated This class should have been an interface instead.
			* The default constuctor should have not been exposed.
			*/
			public RightsStatus() {}
	}		}

			/**
			* @deprecated This class should have been an interface instead.
			* The default constuctor should have not been exposed.
			*/
			public DrmStore() {}
	}		}