From 254c3e4bd6d9abc4a86dee730cb13e9853b1e7b5 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Fri, 12 Apr 2019 09:41:57 -0700
Subject: [PATCH 1/2] Remove support to install apps from a file

Test: atest CtsPackageInstallTestCases
Bug: 123212933
Change-Id: I5afbd60f2c8db68858289edec0302b782677ded5
---
 .../src/com/android/packageinstaller/InstallStart.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
index f2de9ecd8f5d6..881f4b183f408 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
@@ -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.
 

From cd6dbf7e0ba31d2f0180c1d50809bca7a4c5f13f Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Fri, 12 Apr 2019 10:09:13 -0700
Subject: [PATCH 2/2] Automatically run Package Installer tests

Test: atest --test-mapping frameworks/base/packages/PackageInstaller
Bug: 123212933
Change-Id: Iabebe9cf91fcdacca2bc6d566a1072f1e84eb97f
---
 packages/PackageInstaller/TEST_MAPPING | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 packages/PackageInstaller/TEST_MAPPING

diff --git a/packages/PackageInstaller/TEST_MAPPING b/packages/PackageInstaller/TEST_MAPPING
new file mode 100644
index 0000000000000..42aa47cab1545
--- /dev/null
+++ b/packages/PackageInstaller/TEST_MAPPING
@@ -0,0 +1,24 @@
+{
+  "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