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

Merge changes Iabebe9cf,I5afbd60f into qt-dev

Browse Source 
am: 47be500039

Change-Id: I4edab24a5e804815320f121cd473e155c991cab2
This commit is contained in:
Philip P. Moltmann
2019-04-12 13:31:50 -07:00
committed by android-build-merger
parent 3977fd6c4e 47be500039
commit 8fc7873fc7
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/PackageInstaller/TEST_MAPPING Normal file
View File

@@ -0,0 +1,24 @@
{
"presubmit": [
{
"name": "CtsPackageInstallTestCases",
"options": [
{
"exclude-annotation": "android.platform.test.annotations.AppModeInstant"
}
]
},
{
"name": "CtsNoPermissionTestCases"
},
{
"name": "CtsNoPermissionTestCases25"
},
{
"name": "CtsPackageInstallerTapjackingTestCases"
},
{
"name": "CtsPackageUninstallTestCases"
}
]
}

4
packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
View File

@@ -109,8 +109,8 @@ public class InstallStart extends Activity {
} else {
Uri packageUri = intent.getData();
if (packageUri != null && (packageUri.getScheme().equals(ContentResolver.SCHEME_FILE)
|| packageUri.getScheme().equals(ContentResolver.SCHEME_CONTENT))) {
if (packageUri != null && packageUri.getScheme().equals(
ContentResolver.SCHEME_CONTENT)) {
// [IMPORTANT] This path is deprecated, but should still work. Only necessary
// features should be added.