Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 696dc4d

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

Change-Id: I518a109df2c4f071c5804163bf518208e6425e8b
This commit is contained in:
Robert Shih
2016-04-06 17:17:47 +00:00
committed by android-build-merger
parent 779afeeebb 696dc4d8df
commit dd9c91d2ba
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -20073,7 +20073,6 @@ package android.media {
} }
public abstract class DrmInitData { public abstract class DrmInitData {
ctor public DrmInitData();
method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID); method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
} }

1
api/system-current.txt
View File

@@ -21552,7 +21552,6 @@ package android.media {
} }
public abstract class DrmInitData { public abstract class DrmInitData {
ctor public DrmInitData();
method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID); method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
} }

1
api/test-current.txt
View File

@@ -20138,7 +20138,6 @@ package android.media {
} }
public abstract class DrmInitData { public abstract class DrmInitData {
ctor public DrmInitData();
method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID); method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
} }

6
media/java/android/media/DrmInitData.java
View File

@@ -27,6 +27,12 @@ import java.util.UUID;
*/ */
public abstract class DrmInitData { public abstract class DrmInitData {
/**
* Prevent public constuctor access
*/
/* package private */ DrmInitData() {
}
/** /**
* Retrieves initialization data for a given DRM scheme, specified by its UUID. * Retrieves initialization data for a given DRM scheme, specified by its UUID.
* *