Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fc7873f authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge changes Iabebe9cf,I5afbd60f into qt-dev 

am: 47be5000

Change-Id: I4edab24a5e804815320f121cd473e155c991cab2
parents 3977fd6c 47be5000

packages/PackageInstaller/TEST_MAPPING

0 → 100644
+24 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "CtsPackageInstallTestCases",

      "options": [

        {

          "exclude-annotation": "android.platform.test.annotations.AppModeInstant"

        }

      ]

    },

    {

      "name": "CtsNoPermissionTestCases"

    },

    {

      "name": "CtsNoPermissionTestCases25"

    },

    {

      "name": "CtsPackageInstallerTapjackingTestCases"

    },

    {

      "name": "CtsPackageUninstallTestCases"

    }

  ]

}
 
 No newline at end of file

packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java

+2 −2
Original line number Diff line number Diff line
@@ -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.