Make changes to testapps to split a callback
React to the changes so that everything still builds.
Bug: 74409377
Test: builds
Change-Id: I14f9437bf39b002e4d37f98d3686f7312f1a89c0
Merged-In: I14f9437bf39b002e4d37f98d3686f7312f1a89c0
diff --git a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
index 7bd0f70..6ddebb8 100644
--- a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
+++ b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
@@ -31,8 +31,9 @@
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.telephony.MbmsDownloadSession;
+import android.telephony.mbms.DownloadProgressListener;
import android.telephony.mbms.DownloadRequest;
-import android.telephony.mbms.DownloadStateCallback;
+import android.telephony.mbms.DownloadStatusListener;
import android.telephony.mbms.FileInfo;
import android.telephony.mbms.FileServiceInfo;
import android.telephony.mbms.MbmsDownloadSessionCallback;
@@ -143,9 +144,16 @@
}
@Override
- public int registerStateCallback(DownloadRequest downloadRequest,
- DownloadStateCallback callback) throws RemoteException {
- mDownloadStateCallbacks.put(downloadRequest, callback);
+ public int addStatusListener(DownloadRequest downloadRequest,
+ DownloadStatusListener callback) throws RemoteException {
+ mDownloadStatusCallbacks.put(downloadRequest, callback);
+ return MbmsErrors.SUCCESS;
+ }
+
+ @Override
+ public int addProgressListener(DownloadRequest downloadRequest,
+ DownloadProgressListener callback) throws RemoteException {
+ mDownloadProgressCallbacks.put(downloadRequest, callback);
return MbmsErrors.SUCCESS;
}
@@ -183,7 +191,9 @@
// A map of app-identifiers to (maps of service-ids to sets of temp file uris in use)
private final Map<FrontendAppIdentifier, Map<String, Set<Uri>>> mTempFilesInUse =
new ConcurrentHashMap<>();
- private final Map<DownloadRequest, DownloadStateCallback> mDownloadStateCallbacks =
+ private final Map<DownloadRequest, DownloadStatusListener> mDownloadStatusCallbacks =
+ new ConcurrentHashMap<>();
+ private final Map<DownloadRequest, DownloadProgressListener> mDownloadProgressCallbacks =
new ConcurrentHashMap<>();
private HandlerThread mHandlerThread;
@@ -334,13 +344,14 @@
UriPathPair tempFile, FileInfo fileToDownload) {
int result = MbmsDownloadSession.RESULT_SUCCESSFUL;
// Test Callback
- DownloadStateCallback c = mDownloadStateCallbacks.get(request);
- if (c != null) {
- c.onProgressUpdated(request, fileToDownload, 0, 10, 0, 10);
+ DownloadStatusListener statusListener = mDownloadStatusCallbacks.get(request);
+ DownloadProgressListener progressListener = mDownloadProgressCallbacks.get(request);
+ if (progressListener != null) {
+ progressListener.onProgressUpdated(request, fileToDownload, 0, 10, 0, 10);
}
// Test Callback
- if (c != null) {
- c.onStateUpdated(request, fileToDownload,
+ if (statusListener != null) {
+ statusListener.onStatusUpdated(request, fileToDownload,
MbmsDownloadSession.STATUS_ACTIVELY_DOWNLOADING);
}
try {
@@ -367,8 +378,8 @@
result = MbmsDownloadSession.RESULT_CANCELLED;
}
// Test Callback
- if (c != null) {
- c.onProgressUpdated(request, fileToDownload, 10, 10, 10, 10);
+ if (progressListener != null) {
+ progressListener.onProgressUpdated(request, fileToDownload, 10, 10, 10, 10);
}
// Take a round-trip through the download request serialization to exercise it
DownloadRequest request1 = DownloadRequest.Builder.fromSerializedRequest(
diff --git a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
index 76baf05..f77b4ac 100644
--- a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
+++ b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
@@ -27,8 +27,9 @@
import android.support.v7.widget.RecyclerView;
import android.telephony.MbmsDownloadSession;
import android.telephony.SubscriptionManager;
+import android.telephony.mbms.DownloadProgressListener;
import android.telephony.mbms.DownloadRequest;
-import android.telephony.mbms.DownloadStateCallback;
+import android.telephony.mbms.DownloadStatusListener;
import android.telephony.mbms.FileInfo;
import android.telephony.mbms.FileServiceInfo;
import android.telephony.mbms.MbmsDownloadSessionCallback;
@@ -292,8 +293,8 @@
"No DownloadRequest Pending for progress...", Toast.LENGTH_SHORT).show();
return;
}
- mDownloadManager.registerStateCallback(req, sInstance.getMainThreadHandler()::post,
- new DownloadStateCallback(DownloadStateCallback.PROGRESS_UPDATES) {
+ mDownloadManager.addProgressListener(req, sInstance.getMainThreadHandler()::post,
+ new DownloadProgressListener() {
@Override
public void onProgressUpdated(DownloadRequest request, FileInfo fileInfo,
int currentDownloadSize, int fullDownloadSize,
@@ -303,16 +304,6 @@
+ " fd: " + fullDownloadSize, Toast.LENGTH_SHORT)
.show();
}
-
- @Override
- public void onStateUpdated(DownloadRequest request, FileInfo fileInfo,
- @MbmsDownloadSession.DownloadStatus int state) {
- // only registered for state callback, this shouldn't happen!
- Toast.makeText(EmbmsTestDownloadApp.this,
- "State ERROR: received state update for callback that didn't"
- + " filter it",
- Toast.LENGTH_SHORT).show();
- }
});
});
@@ -330,21 +321,10 @@
"No DownloadRequest Pending for state...", Toast.LENGTH_SHORT).show();
return;
}
- mDownloadManager.registerStateCallback(req, sInstance.getMainThreadHandler()::post,
- new DownloadStateCallback(DownloadStateCallback.STATE_UPDATES) {
+ mDownloadManager.addStatusListener(req, sInstance.getMainThreadHandler()::post,
+ new DownloadStatusListener() {
@Override
- public void onProgressUpdated(DownloadRequest request, FileInfo fileInfo,
- int currentDownloadSize, int fullDownloadSize,
- int currentDecodedSize, int fullDecodedSize) {
- // only registered for state callback, this shouldn't happen!
- Toast.makeText(EmbmsTestDownloadApp.this,
- "Progress ERROR: received progress update for"
- + " callback that didn't "
- + "filter it", Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onStateUpdated(DownloadRequest request, FileInfo fileInfo,
+ public void onStatusUpdated(DownloadRequest request, FileInfo fileInfo,
@MbmsDownloadSession.DownloadStatus int state) {
Toast.makeText(EmbmsTestDownloadApp.this,
"State Updated (" + fileInfo + ") state: " + state,
@@ -367,8 +347,20 @@
"No DownloadRequest Pending for state...", Toast.LENGTH_SHORT).show();
return;
}
- mDownloadManager.registerStateCallback(req, sInstance.getMainThreadHandler()::post,
- new DownloadStateCallback() {
+
+ mDownloadManager.addStatusListener(req, sInstance.getMainThreadHandler()::post,
+ new DownloadStatusListener() {
+ @Override
+ public void onStatusUpdated(DownloadRequest request, FileInfo fileInfo,
+ @MbmsDownloadSession.DownloadStatus int state) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "State Updated (" + fileInfo + ") state: " + state,
+ Toast.LENGTH_SHORT).show();
+ }
+ });
+
+ mDownloadManager.addProgressListener(req, sInstance.getMainThreadHandler()::post,
+ new DownloadProgressListener() {
@Override
public void onProgressUpdated(DownloadRequest request, FileInfo fileInfo,
int currentDownloadSize, int fullDownloadSize,
@@ -378,14 +370,6 @@
+ " fd: " + fullDownloadSize, Toast.LENGTH_SHORT)
.show();
}
-
- @Override
- public void onStateUpdated(DownloadRequest request, FileInfo fileInfo,
- @MbmsDownloadSession.DownloadStatus int state) {
- Toast.makeText(EmbmsTestDownloadApp.this,
- "State Updated (" + fileInfo + ") state: " + state,
- Toast.LENGTH_SHORT).show();
- }
});
});
}