Adjust testapps for API changes
Test: manual
Bug: 30981736
Change-Id: I8ca3015253d9171dec119958017fc0ab7085c869
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 b3b6a86..e7acf09 100644
--- a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
+++ b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
@@ -35,7 +35,6 @@
import android.telephony.mbms.DownloadStateCallback;
import android.telephony.mbms.FileInfo;
import android.telephony.mbms.FileServiceInfo;
-import android.telephony.mbms.IMbmsDownloadManagerCallback;
import android.telephony.mbms.MbmsDownloadManagerCallback;
import android.telephony.mbms.MbmsException;
import android.telephony.mbms.UriPathPair;
@@ -91,19 +90,11 @@
getPackageManager().getNameForUid(packageUid));
mAppReceivers.put(appKey, appReceiver);
} else {
- try {
- callback.error(
- MbmsException.InitializationErrors.ERROR_DUPLICATE_INITIALIZE, "");
- } catch (RemoteException e) {
- // ignore, it was an error anyway
- }
+ callback.onError(
+ MbmsException.InitializationErrors.ERROR_DUPLICATE_INITIALIZE, "");
return;
}
- try {
- callback.middlewareReady();
- } catch (RemoteException e) {
- // TODO: call dispose
- }
+ callback.onMiddlewareReady();
}, INITIALIZATION_DELAY);
return MbmsException.SUCCESS;
@@ -121,12 +112,8 @@
.getFileServicesForClasses(serviceClasses);
mHandler.postDelayed(() -> {
- try {
- IMbmsDownloadManagerCallback appCallback = mAppCallbacks.get(appKey);
- appCallback.fileServicesUpdated(serviceInfos);
- } catch (RemoteException e) {
- // TODO: call dispose
- }
+ MbmsDownloadManagerCallback appCallback = mAppCallbacks.get(appKey);
+ appCallback.onFileServicesUpdated(serviceInfos);
}, SEND_FILE_SERVICE_INFO_DELAY);
return MbmsException.SUCCESS;
}
@@ -167,11 +154,20 @@
mActiveDownloadRequests.get(appKey).remove(downloadRequest);
return MbmsException.SUCCESS;
}
+
+ @Override
+ public void onAppCallbackDied(int uid, int subscriptionId) {
+ FrontendAppIdentifier appKey = new FrontendAppIdentifier(uid, subscriptionId);
+
+ Log.i(LOG_TAG, "Disposing app " + appKey + " due to binder death");
+ mAppCallbacks.remove(appKey);
+ // TODO: call dispose
+ }
};
private static EmbmsSampleDownloadService sInstance = null;
- private final Map<FrontendAppIdentifier, IMbmsDownloadManagerCallback> mAppCallbacks =
+ private final Map<FrontendAppIdentifier, MbmsDownloadManagerCallback> mAppCallbacks =
new HashMap<>();
private final Map<FrontendAppIdentifier, ComponentName> mAppReceivers = new HashMap<>();
private final Map<FrontendAppIdentifier, String> mAppTempFileRoots = new HashMap<>();
@@ -365,14 +361,14 @@
downloadResultIntent.putExtra(VendorUtils.EXTRA_REQUEST, request1);
downloadResultIntent.putExtra(VendorUtils.EXTRA_FINAL_URI,
tempFile.getFilePathUri());
- downloadResultIntent.putExtra(MbmsDownloadManager.EXTRA_FILE_INFO, fileToDownload);
+ downloadResultIntent.putExtra(MbmsDownloadManager.EXTRA_MBMS_FILE_INFO, fileToDownload);
downloadResultIntent.putExtra(VendorUtils.EXTRA_TEMP_FILE_ROOT,
mAppTempFileRoots.get(appKey));
ArrayList<Uri> tempFileList = new ArrayList<>(1);
tempFileList.add(tempFile.getFilePathUri());
downloadResultIntent.getExtras().putParcelableArrayList(
VendorUtils.EXTRA_TEMP_LIST, tempFileList);
- downloadResultIntent.putExtra(MbmsDownloadManager.EXTRA_RESULT, result);
+ downloadResultIntent.putExtra(MbmsDownloadManager.EXTRA_MBMS_DOWNLOAD_RESULT, result);
downloadResultIntent.setComponent(mAppReceivers.get(appKey));
sendOrderedBroadcast(downloadResultIntent,
diff --git a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/DownloadCompletionReceiver.java b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/DownloadCompletionReceiver.java
index ef9e672..0ecdb11 100644
--- a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/DownloadCompletionReceiver.java
+++ b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/DownloadCompletionReceiver.java
@@ -26,13 +26,13 @@
@Override
public void onReceive(Context context, Intent intent) {
if (EmbmsTestDownloadApp.DOWNLOAD_DONE_ACTION.equals(intent.getAction())) {
- int result = intent.getIntExtra(MbmsDownloadManager.EXTRA_RESULT,
+ int result = intent.getIntExtra(MbmsDownloadManager.EXTRA_MBMS_DOWNLOAD_RESULT,
MbmsDownloadManager.RESULT_CANCELLED);
if (result != MbmsDownloadManager.RESULT_SUCCESSFUL) {
EmbmsTestDownloadApp.getInstance().onDownloadFailed(result);
}
Uri completedFile = intent.getParcelableExtra(
- MbmsDownloadManager.EXTRA_COMPLETED_FILE_URI);
+ MbmsDownloadManager.EXTRA_MBMS_COMPLETED_FILE_URI);
EmbmsTestDownloadApp.getInstance().onDownloadDone(completedFile);
}
}
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 80045ce..f6dbe14 100644
--- a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
+++ b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
@@ -155,13 +155,13 @@
private MbmsDownloadManagerCallback mCallback = new MbmsDownloadManagerCallback() {
@Override
- public void error(int errorCode, String message) {
+ public void onError(int errorCode, String message) {
runOnUiThread(() -> Toast.makeText(EmbmsTestDownloadApp.this,
"Error " + errorCode + ": " + message, Toast.LENGTH_SHORT).show());
}
@Override
- public void fileServicesUpdated(List<FileServiceInfo> services) {
+ public void onFileServicesUpdated(List<FileServiceInfo> services) {
EmbmsTestDownloadApp.this.runOnUiThread(() ->
Toast.makeText(EmbmsTestDownloadApp.this,
"Got services length " + services.size(),
@@ -170,7 +170,7 @@
}
@Override
- public void middlewareReady() {
+ public void onMiddlewareReady() {
runOnUiThread(() -> Toast.makeText(EmbmsTestDownloadApp.this,
"Initialization done", Toast.LENGTH_SHORT).show());
}
@@ -362,7 +362,7 @@
.build();
try {
- mDownloadManager.download(request, null);
+ mDownloadManager.download(request, null, null);
mDownloadRequestAdapter.add(request);
} catch (MbmsException e) {
Toast.makeText(EmbmsTestDownloadApp.this,