Merge "DrmInitData: prevent public constructor access" into nyc-dev
This commit is contained in:
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user