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

Commit ba8f2ad1 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge changes Iabebe9cf,I5afbd60f into qt-dev am: 47be5000 am: 8fc7873f"

parents 929fb159 259b8754

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.