diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/service/carrier/CarrierMessagingService.java | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt index 6fe46b12186f..1c1826479089 100644 --- a/api/current.txt +++ b/api/current.txt @@ -34402,7 +34402,7 @@ package android.service.carrier { field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1 field public static final int RECEIVE_OPTIONS_DEFAULT = 0; // 0x0 field public static final int RECEIVE_OPTIONS_DROP = 1; // 0x1 - field public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE = 2; // 0x2 + field public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE = 2; // 0x2 field public static final int SEND_FLAG_REQUEST_DELIVERY_STATUS = 1; // 0x1 field public static final int SEND_STATUS_ERROR = 2; // 0x2 field public static final int SEND_STATUS_OK = 0; // 0x0 diff --git a/api/system-current.txt b/api/system-current.txt index 29fd870ea74d..87bc33e28bbf 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37108,7 +37108,7 @@ package android.service.carrier { field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1 field public static final int RECEIVE_OPTIONS_DEFAULT = 0; // 0x0 field public static final int RECEIVE_OPTIONS_DROP = 1; // 0x1 - field public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE = 2; // 0x2 + field public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE = 2; // 0x2 field public static final int SEND_FLAG_REQUEST_DELIVERY_STATUS = 1; // 0x1 field public static final int SEND_STATUS_ERROR = 2; // 0x2 field public static final int SEND_STATUS_OK = 0; // 0x0 diff --git a/api/test-current.txt b/api/test-current.txt index 892bcec68cae..f9e2a0a30eb4 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -34479,7 +34479,7 @@ package android.service.carrier { field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1 field public static final int RECEIVE_OPTIONS_DEFAULT = 0; // 0x0 field public static final int RECEIVE_OPTIONS_DROP = 1; // 0x1 - field public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE = 2; // 0x2 + field public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE = 2; // 0x2 field public static final int SEND_FLAG_REQUEST_DELIVERY_STATUS = 1; // 0x1 field public static final int SEND_STATUS_ERROR = 2; // 0x2 field public static final int SEND_STATUS_OK = 0; // 0x0 diff --git a/core/java/android/service/carrier/CarrierMessagingService.java b/core/java/android/service/carrier/CarrierMessagingService.java index 140341cfaece..88a78c36d112 100644 --- a/core/java/android/service/carrier/CarrierMessagingService.java +++ b/core/java/android/service/carrier/CarrierMessagingService.java @@ -56,7 +56,7 @@ public abstract class CarrierMessagingService extends Service { * new message notification should be shown. * * @see #RECEIVE_OPTIONS_DROP - * @see #RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE + * @see #RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE */ public static final int RECEIVE_OPTIONS_DEFAULT = 0; @@ -72,7 +72,7 @@ public abstract class CarrierMessagingService extends Service { * credential-encrypted storage of the device is not available before the user unlocks the * phone. It is only applicable to devices that support file-based encryption. */ - public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE = 0x2; + public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE = 0x2; /** * Indicates that an SMS or MMS message was successfully sent. @@ -148,7 +148,7 @@ public abstract class CarrierMessagingService extends Service { * @param subId SMS subscription ID of the SIM * @param callback result callback. Call with a bitmask integer to indicate how the incoming * text SMS should be handled by the platform. Use {@link #RECEIVE_OPTIONS_DROP} and - * {@link #RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE} + * {@link #RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE} * to set the flags in the bitmask. */ public void onReceiveTextSms(@NonNull MessagePdu pdu, @NonNull String format, @@ -157,7 +157,7 @@ public abstract class CarrierMessagingService extends Service { @Override public void onReceiveResult(Boolean result) throws RemoteException { callback.onReceiveResult(result ? RECEIVE_OPTIONS_DEFAULT : RECEIVE_OPTIONS_DROP - | RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE); + | RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE); } }); } |