Merge "Avoid unnecessary object allocation in CryptoInfo.set" (c0f79de1) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaCodec.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2440,6 +2440,8 @@ final public class MediaCodec {
	}		}
	};		};

			private final Pattern zeroPattern = new Pattern(0, 0);

	/**		/**
	* The pattern applicable to the protected data in each subsample.		* The pattern applicable to the protected data in each subsample.
	*/		*/
	@@ -2462,7 +2464,7 @@ final public class MediaCodec {
	key = newKey;		key = newKey;
	iv = newIV;		iv = newIV;
	mode = newMode;		mode = newMode;
	pattern = new Pattern(0, 0);		pattern = zeroPattern;
	}		}

	/**		/**