diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | drm/java/android/drm/DrmManagerClient.java | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 884bc5aa73a8..80e0edd04d90 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13439,6 +13439,7 @@ package android.drm { method public android.drm.DrmConvertedStatus closeConvertSession(int); method public android.drm.DrmConvertedStatus convertData(int, byte[]); method public String[] getAvailableDrmEngines(); + method @NonNull public java.util.Collection<android.drm.DrmSupportInfo> getAvailableDrmSupportInfo(); method public android.content.ContentValues getConstraints(String, int); method public android.content.ContentValues getConstraints(android.net.Uri, int); method public int getDrmObjectType(String, String); diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index fcebad339f2b..041300c4b1b0 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -16,6 +16,7 @@ package android.drm; +import android.annotation.NonNull; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; @@ -37,6 +38,8 @@ import java.io.FileInputStream; import java.io.IOException; import java.lang.ref.WeakReference; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.concurrent.atomic.AtomicBoolean; @@ -370,6 +373,17 @@ public class DrmManagerClient implements AutoCloseable { } /** + * Retrieves information about all the DRM plug-ins (agents) that are + * registered with the DRM framework. + * + * @return List of all the DRM plug-ins (agents) that are registered with + * the DRM framework. + */ + public @NonNull Collection<DrmSupportInfo> getAvailableDrmSupportInfo() { + return Arrays.asList(_getAllSupportInfo(mUniqueId)); + } + + /** * Retrieves constraint information for rights-protected content. * * @param path Path to the content from which you are retrieving DRM constraints. |