Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev

Browse Source
This commit is contained in:
Hall Liu
2017-10-11 23:53:11 +00:00
committed by Android (Google) Code Review
parent f718585bf4 fad72cb55b
commit adaae4cb91
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java
View File

@@ -288,7 +288,7 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
return;
}
List<Uri> tempFiles = intent.getParcelableExtra(VendorUtils.EXTRA_TEMP_LIST);
List<Uri> tempFiles = intent.getParcelableArrayListExtra(VendorUtils.EXTRA_TEMP_LIST);
if (tempFiles == null) {
return;
}
@@ -310,7 +310,7 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
return;
}
int fdCount = intent.getIntExtra(VendorUtils.EXTRA_FD_COUNT, 0);
List<Uri> pausedList = intent.getParcelableExtra(VendorUtils.EXTRA_PAUSED_LIST);
List<Uri> pausedList = intent.getParcelableArrayListExtra(VendorUtils.EXTRA_PAUSED_LIST);
if (fdCount == 0 && (pausedList == null || pausedList.size() == 0)) {
Log.i(LOG_TAG, "No temp files actually requested. Ending.");
@@ -493,9 +493,14 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
} catch (PackageManager.NameNotFoundException e) {
throw new RuntimeException("Package manager couldn't find " + context.getPackageName());
}
if (appInfo.metaData == null) {
throw new RuntimeException("App must declare the file provider authority as metadata " +
"in the manifest.");
}
String authority = appInfo.metaData.getString(MBMS_FILE_PROVIDER_META_DATA_KEY);
if (authority == null) {
throw new RuntimeException("Must declare the file provider authority as meta data");
throw new RuntimeException("App must declare the file provider authority as metadata " +
"in the manifest.");
}
return authority;
}