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"

Browse Source 
am: 5f123e6ad6

Change-Id: Ib8023d966e01fd2acefc464d8d25ed5030cfd85b
This commit is contained in:
Hall Liu
2017-10-11 23:28:42 +00:00
committed by android-build-merger
parent 946ff79971 5f123e6ad6
commit 1c36619f5b
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

@@ -287,7 +287,7 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
return; return;
} }
List<Uri> tempFiles = intent.getParcelableExtra(VendorUtils.EXTRA_TEMP_LIST); List<Uri> tempFiles = intent.getParcelableArrayListExtra(VendorUtils.EXTRA_TEMP_LIST);
if (tempFiles == null) { if (tempFiles == null) {
return; return;
} }
@@ -309,7 +309,7 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
return; return;
} }
int fdCount = intent.getIntExtra(VendorUtils.EXTRA_FD_COUNT, 0); 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)) { if (fdCount == 0 && (pausedList == null || pausedList.size() == 0)) {
Log.i(LOG_TAG, "No temp files actually requested. Ending."); Log.i(LOG_TAG, "No temp files actually requested. Ending.");
@@ -492,9 +492,14 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
throw new RuntimeException("Package manager couldn't find " + context.getPackageName()); 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); String authority = appInfo.metaData.getString(MBMS_FILE_PROVIDER_META_DATA_KEY);
if (authority == null) { 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; return authority;
} }