Merge "Added some common error codes in MediaPlayer.java" into jb-mr1-dev (71d7c3c6) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −4

Original line number	Diff line number	Diff line
		@@ -6475,6 +6475,7 @@ package android.content.pm {
		method public abstract int checkSignatures(int, int);
		method public abstract void clearPackagePreferredActivities(java.lang.String);
		method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
		method public abstract void extendVerificationTimeout(int, int, long);
		method public abstract android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		@@ -6533,7 +6534,6 @@ package android.content.pm {
		method public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);
		method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
		method public abstract void verifyPendingInstall(int, int);
		method public abstract void extendVerificationTimeout(int, int, long);
		field public static final int COMPONENT_ENABLED_STATE_DEFAULT = 0; // 0x0
		field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2
		field public static final int COMPONENT_ENABLED_STATE_DISABLED_USER = 3; // 0x3
		@@ -6594,6 +6594,7 @@ package android.content.pm {
		field public static final int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000
		field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
		field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
		field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
		field public static final int PERMISSION_DENIED = -1; // 0xffffffff
		field public static final int PERMISSION_GRANTED = 0; // 0x0
		field public static final int SIGNATURE_FIRST_NOT_SIGNED = -1; // 0xffffffff
		@@ -6604,7 +6605,6 @@ package android.content.pm {
		field public static final int SIGNATURE_UNKNOWN_PACKAGE = -4; // 0xfffffffc
		field public static final int VERIFICATION_ALLOW = 1; // 0x1
		field public static final int VERIFICATION_REJECT = -1; // 0xffffffff
		field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80
		}

		public static class PackageManager.NameNotFoundException extends android.util.AndroidException {
		@@ -11489,9 +11489,13 @@ package android.media {
		method public void setWakeMode(android.content.Context, int);
		method public void start() throws java.lang.IllegalStateException;
		method public void stop() throws java.lang.IllegalStateException;
		field public static final int MEDIA_ERROR_IO = -1004; // 0xfffffc14
		field public static final int MEDIA_ERROR_MALFORMED = -1007; // 0xfffffc11
		field public static final int MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK = 200; // 0xc8
		field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64
		field public static final int MEDIA_ERROR_TIMED_OUT = -110; // 0xffffff92
		field public static final int MEDIA_ERROR_UNKNOWN = 1; // 0x1
		field public static final int MEDIA_ERROR_UNSUPPORTED = -1010; // 0xfffffc0e
		field public static final int MEDIA_INFO_BAD_INTERLEAVING = 800; // 0x320
		field public static final int MEDIA_INFO_BUFFERING_END = 702; // 0x2be
		field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd
		@@ -20069,8 +20073,8 @@ package android.service.dreams {
		method public void setContentView(android.view.View);
		method public void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
		method public void setInteractive(boolean);
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.dreams.Dream";
		field public static final java.lang.String METADATA_NAME_CONFIG_ACTIVITY = "android.service.dreams.config_activity";
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.dreams.Dream";
		}

		}
		@@ -21328,6 +21332,7 @@ package android.test.mock {
		method public int checkSignatures(int, int);
		method public void clearPackagePreferredActivities(java.lang.String);
		method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
		method public void extendVerificationTimeout(int, int, long);
		method public android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		@@ -21385,7 +21390,6 @@ package android.test.mock {
		method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
		method public void setInstallerPackageName(java.lang.String, java.lang.String);
		method public void verifyPendingInstall(int, int);
		method public void extendVerificationTimeout(int, int, long);
		}

		public class MockResources extends android.content.res.Resources {

media/java/android/media/MediaPlayer.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -2265,6 +2265,16 @@ public class MediaPlayer
		*/
		public static final int MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK = 200;

		/** File or network related operation errors. */
		public static final int MEDIA_ERROR_IO = -1004;
		/** Bitstream is not conforming to the related coding standard or file spec. */
		public static final int MEDIA_ERROR_MALFORMED = -1007;
		/** Bitstream is conforming to the related coding standard or file spec, but
		* the media framework does not support the feature. */
		public static final int MEDIA_ERROR_UNSUPPORTED = -1010;
		/** Some operation takes too long to complete, usually more than 3-5 seconds. */
		public static final int MEDIA_ERROR_TIMED_OUT = -110;

		/**
		* Interface definition of a callback to be invoked when there
		* has been an error during an asynchronous operation (other errors
		@@ -2283,6 +2293,12 @@ public class MediaPlayer
		* </ul>
		* @param extra an extra code, specific to the error. Typically
		* implementation dependent.
		* <ul>
		* <li>{@link #MEDIA_ERROR_IO}
		* <li>{@link #MEDIA_ERROR_MALFORMED}
		* <li>{@link #MEDIA_ERROR_UNSUPPORTED}
		* <li>{@link #MEDIA_ERROR_TIMED_OUT}
		* </ul>
		* @return True if the method handled the error, false if it didn't.
		* Returning false, or not having an OnErrorListener at all, will
		* cause the OnCompletionListener to be called.