summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
Diffstat (limited to 'api')
-rw-r--r--api/current.txt26
-rw-r--r--api/system-current.txt26
2 files changed, 26 insertions, 26 deletions
diff --git a/api/current.txt b/api/current.txt
index 3b57f18..a400fa6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20,8 +20,8 @@ package android {
field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
- field public static final java.lang.String BIND_CARRIER_CONFIG_SERVICE = "android.permission.BIND_CARRIER_CONFIG_SERVICE";
- field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
+ field public static final deprecated java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
+ field public static final java.lang.String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES";
field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE";
field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";
@@ -15730,7 +15730,7 @@ package android.media {
method public void restoreKeys(byte[], byte[]);
method public void setOnEventListener(android.media.MediaDrm.OnEventListener);
method public void setOnExpirationUpdateListener(android.media.MediaDrm.OnExpirationUpdateListener, android.os.Handler);
- method public void setOnKeysChangeListener(android.media.MediaDrm.OnKeysChangeListener, android.os.Handler);
+ 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);
field public static final int EVENT_KEY_EXPIRED = 3; // 0x3
@@ -15738,11 +15738,6 @@ package android.media {
field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1
field public static final int EVENT_SESSION_RECLAIMED = 5; // 0x5
field public static final int EVENT_VENDOR_DEFINED = 4; // 0x4
- field public static final int KEY_STATUS_EXPIRED = 1; // 0x1
- field public static final int KEY_STATUS_INTERNAL_ERROR = 4; // 0x4
- field public static final int KEY_STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2
- field public static final int KEY_STATUS_PENDING = 3; // 0x3
- field public static final int KEY_STATUS_USABLE = 0; // 0x0
field public static final int KEY_TYPE_OFFLINE = 2; // 0x2
field public static final int KEY_TYPE_RELEASE = 3; // 0x3
field public static final int KEY_TYPE_STREAMING = 1; // 0x1
@@ -15751,9 +15746,6 @@ package android.media {
field public static final java.lang.String PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId";
field public static final java.lang.String PROPERTY_VENDOR = "vendor";
field public static final java.lang.String PROPERTY_VERSION = "version";
- field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0
- field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2
- field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1
}
public final class MediaDrm.CryptoSession {
@@ -15767,11 +15759,19 @@ package android.media {
method public byte[] getData();
method public java.lang.String getDefaultUrl();
method public int getRequestType();
+ field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0
+ field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2
+ field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1
}
public static final class MediaDrm.KeyStatus {
method public byte[] getKeyId();
method public int getStatusCode();
+ field public static final int STATUS_EXPIRED = 1; // 0x1
+ field public static final int STATUS_INTERNAL_ERROR = 4; // 0x4
+ field public static final int STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2
+ field public static final int STATUS_PENDING = 3; // 0x3
+ field public static final int STATUS_USABLE = 0; // 0x0
}
public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException {
@@ -15786,8 +15786,8 @@ package android.media {
method public abstract void onExpirationUpdate(android.media.MediaDrm, byte[], long);
}
- public static abstract interface MediaDrm.OnKeysChangeListener {
- method public abstract void onKeysChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean);
+ public static abstract interface MediaDrm.OnKeyStatusChangeListener {
+ method public abstract void onKeyStatusChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean);
}
public static final class MediaDrm.ProvisionRequest {
diff --git a/api/system-current.txt b/api/system-current.txt
index dbe0d4f..14b56c7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -28,8 +28,8 @@ package android {
field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
- field public static final java.lang.String BIND_CARRIER_CONFIG_SERVICE = "android.permission.BIND_CARRIER_CONFIG_SERVICE";
- field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
+ field public static final deprecated java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
+ field public static final java.lang.String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES";
field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE";
field public static final java.lang.String BIND_CONDITION_PROVIDER_SERVICE = "android.permission.BIND_CONDITION_PROVIDER_SERVICE";
field public static final deprecated java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE";
@@ -16967,7 +16967,7 @@ package android.media {
method public void restoreKeys(byte[], byte[]);
method public void setOnEventListener(android.media.MediaDrm.OnEventListener);
method public void setOnExpirationUpdateListener(android.media.MediaDrm.OnExpirationUpdateListener, android.os.Handler);
- method public void setOnKeysChangeListener(android.media.MediaDrm.OnKeysChangeListener, android.os.Handler);
+ 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();
@@ -16976,11 +16976,6 @@ package android.media {
field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1
field public static final int EVENT_SESSION_RECLAIMED = 5; // 0x5
field public static final int EVENT_VENDOR_DEFINED = 4; // 0x4
- field public static final int KEY_STATUS_EXPIRED = 1; // 0x1
- field public static final int KEY_STATUS_INTERNAL_ERROR = 4; // 0x4
- field public static final int KEY_STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2
- field public static final int KEY_STATUS_PENDING = 3; // 0x3
- field public static final int KEY_STATUS_USABLE = 0; // 0x0
field public static final int KEY_TYPE_OFFLINE = 2; // 0x2
field public static final int KEY_TYPE_RELEASE = 3; // 0x3
field public static final int KEY_TYPE_STREAMING = 1; // 0x1
@@ -16989,9 +16984,6 @@ package android.media {
field public static final java.lang.String PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId";
field public static final java.lang.String PROPERTY_VENDOR = "vendor";
field public static final java.lang.String PROPERTY_VERSION = "version";
- field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0
- field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2
- field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1
}
public final class MediaDrm.CryptoSession {
@@ -17005,11 +16997,19 @@ package android.media {
method public byte[] getData();
method public java.lang.String getDefaultUrl();
method public int getRequestType();
+ field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0
+ field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2
+ field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1
}
public static final class MediaDrm.KeyStatus {
method public byte[] getKeyId();
method public int getStatusCode();
+ field public static final int STATUS_EXPIRED = 1; // 0x1
+ field public static final int STATUS_INTERNAL_ERROR = 4; // 0x4
+ field public static final int STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2
+ field public static final int STATUS_PENDING = 3; // 0x3
+ field public static final int STATUS_USABLE = 0; // 0x0
}
public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException {
@@ -17024,8 +17024,8 @@ package android.media {
method public abstract void onExpirationUpdate(android.media.MediaDrm, byte[], long);
}
- public static abstract interface MediaDrm.OnKeysChangeListener {
- method public abstract void onKeysChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean);
+ public static abstract interface MediaDrm.OnKeyStatusChangeListener {
+ method public abstract void onKeyStatusChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean);
}
public static final class MediaDrm.ProvisionRequest {
generated by cgit v1.1 at 2025-08-19 10:37:39 +0000