summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Chen <refuhoo@google.com>2020-11-04 17:07:01 -0800
committerXiangyu/Malcolm Chen <refuhoo@google.com>2020-12-01 19:42:09 +0000
commitfcf4383ac01545449878af866bf725f15360f9c9 (patch)
tree69415d363cf303d13a65d8fe10bc219119126aed
parent395f04334ef0dde2f392a386f72a8005231ca824 (diff)
downloadMms-fcf4383ac01545449878af866bf725f15360f9c9.tar.gz
Expose CarrierMessagingServiceWrapper as System API.
Also adding Executor when callback, according to API council's feedback. Bug: 172087216 Test: build Change-Id: I96cef9d3847bce2adf3ee04200704fe035e9d645
-rw-r--r--src/com/android/mms/service/DownloadRequest.java6
-rw-r--r--src/com/android/mms/service/MmsRequest.java2
-rw-r--r--src/com/android/mms/service/SendRequest.java6
3 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/mms/service/DownloadRequest.java b/src/com/android/mms/service/DownloadRequest.java
index 96be5fd..b17a35a 100644
--- a/src/com/android/mms/service/DownloadRequest.java
+++ b/src/com/android/mms/service/DownloadRequest.java
@@ -291,7 +291,8 @@ public class DownloadRequest extends MmsRequest {
CarrierDownloadCompleteCallback carrierDownloadCallback) {
mCarrierDownloadCallback = carrierDownloadCallback;
if (mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(
- context, carrierMessagingServicePackage, ()->onServiceReady())) {
+ context, carrierMessagingServicePackage, Runnable::run,
+ ()->onServiceReady())) {
LogUtil.v("bindService() for carrier messaging service succeeded. messageId: "
+ mMessageId);
} else {
@@ -305,7 +306,8 @@ public class DownloadRequest extends MmsRequest {
private void onServiceReady() {
try {
mCarrierMessagingServiceWrapper.downloadMms(
- mContentUri, mSubId, Uri.parse(mLocationUrl), mCarrierDownloadCallback);
+ mContentUri, mSubId, Uri.parse(mLocationUrl), Runnable::run,
+ mCarrierDownloadCallback);
} catch (RuntimeException e) {
LogUtil.e("Exception downloading MMS for messageId " + mMessageId
+ " using the carrier messaging service: " + e, e);
diff --git a/src/com/android/mms/service/MmsRequest.java b/src/com/android/mms/service/MmsRequest.java
index de24a49..b6a8bd4 100644
--- a/src/com/android/mms/service/MmsRequest.java
+++ b/src/com/android/mms/service/MmsRequest.java
@@ -457,7 +457,7 @@ public abstract class MmsRequest {
}
@Override
- public void onFilterComplete(int result) {
+ public void onReceiveSmsComplete(int result) {
LogUtil.e("Unexpected onFilterComplete call for messageId " + mMessageId
+ " with result: " + result);
}
diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java
index c159cbb..6691bac 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -407,7 +407,8 @@ public class SendRequest extends MmsRequest {
CarrierSendCompleteCallback carrierSendCompleteCallback) {
mCarrierSendCompleteCallback = carrierSendCompleteCallback;
if (mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(
- context, carrierMessagingServicePackage, () -> onServiceReady())) {
+ context, carrierMessagingServicePackage, Runnable::run,
+ () -> onServiceReady())) {
LogUtil.v("bindService() for carrier messaging service succeeded. messageId: "
+ mMessageId);
} else {
@@ -426,7 +427,8 @@ public class SendRequest extends MmsRequest {
locationUri = Uri.parse(mLocationUrl);
}
mCarrierMessagingServiceWrapper.sendMms(
- mPduUri, mSubId, locationUri, mCarrierSendCompleteCallback);
+ mPduUri, mSubId, locationUri, Runnable::run,
+ mCarrierSendCompleteCallback);
} catch (RuntimeException e) {
LogUtil.e("Exception sending MMS using the carrier messaging service. messageId: "
+ mMessageId + e, e);