Remove unused MediaDrm.unprovisionDevice
bug:25726218
Change-Id: Ibbd51aaa1ee4c21c9ec8b162fc6e378ab7ba6e7b
diff --git a/api/system-current.txt b/api/system-current.txt
index 5360dca..86405a9 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -21409,7 +21409,6 @@
method public void setOnKeyStatusChangeListener(android.media.MediaDrm.OnKeyStatusChangeListener, android.os.Handler);
method public void setPropertyByteArray(java.lang.String, byte[]);
method public void setPropertyString(java.lang.String, java.lang.String);
- method public void unprovisionDevice();
field public static final int EVENT_KEY_EXPIRED = 3; // 0x3
field public static final int EVENT_KEY_REQUIRED = 2; // 0x2
field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1
diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index ab61e2b..db0c5bb 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -906,18 +906,6 @@
throws DeniedByServerException;
/**
- * Remove provisioning from a device. Only system apps may unprovision a
- * device. Note that removing provisioning will invalidate any keys saved
- * for offline use (KEY_TYPE_OFFLINE), which may render downloaded content
- * unplayable until new licenses are acquired. Since provisioning is global
- * to the device, license invalidation will apply to all content downloaded
- * by any app, so appropriate warnings should be given to the user.
- * @hide
- */
- @SystemApi
- public native void unprovisionDevice();
-
- /**
* A means of enforcing limits on the number of concurrent streams per subscriber
* across devices is provided via SecureStop. This is achieved by securely
* monitoring the lifetime of sessions.
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 275de1ad..b8849c6 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -1048,22 +1048,6 @@
return certificateObj;
}
-static void android_media_MediaDrm_unprovisionDeviceNative(
- JNIEnv *env, jobject thiz) {
- sp<IDrm> drm = GetDrm(env, thiz);
-
- if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException",
- "MediaDrm obj is null");
- return;
- }
-
- status_t err = drm->unprovisionDevice();
-
- throwExceptionAsNecessary(env, err, "Failed to handle provision response");
- return;
-}
-
static jobject android_media_MediaDrm_getSecureStops(
JNIEnv *env, jobject thiz) {
sp<IDrm> drm = GetDrm(env, thiz);
@@ -1496,9 +1480,6 @@
{ "provideProvisionResponseNative", "([B)Landroid/media/MediaDrm$Certificate;",
(void *)android_media_MediaDrm_provideProvisionResponseNative },
- { "unprovisionDevice", "()V",
- (void *)android_media_MediaDrm_unprovisionDeviceNative },
-
{ "getSecureStops", "()Ljava/util/List;",
(void *)android_media_MediaDrm_getSecureStops },