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

Commit dd9c91d2 authored Apr 06, 2016 by Robert Shih Committed by android-build-merger Apr 06, 2016

Merge "DrmInitData: prevent public constructor access" into nyc-dev

am: 696dc4d8

* commit '696dc4d8':
  DrmInitData: prevent public constructor access

Change-Id: I518a109df2c4f071c5804163bf518208e6425e8b

parents 779afeee 696dc4d8

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -20073,7 +20073,6 @@ package android.media {
		}

		public abstract class DrmInitData {
		ctor public DrmInitData();
		method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
		}

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -21552,7 +21552,6 @@ package android.media {
		}

		public abstract class DrmInitData {
		ctor public DrmInitData();
		method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
		}

api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -20138,7 +20138,6 @@ package android.media {
		}

		public abstract class DrmInitData {
		ctor public DrmInitData();
		method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
		}

media/java/android/media/DrmInitData.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,12 @@ import java.util.UUID;
		*/
		public abstract class DrmInitData {

		/**
		* Prevent public constuctor access
		*/
		/* package private */ DrmInitData() {
		}

		/**
		* Retrieves initialization data for a given DRM scheme, specified by its UUID.
		*