commit dba1ab2379dd82123b837a93bcbd6ac0d753d1e7
author android-build-team Robot <android-build-team-robot@google.com> Fri Mar 15 23:16:37 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Mar 15 23:16:37 2019 +0000
tree 0992507dd8584e34a4d10e456adbf05b72833b5e
parent 1ff15b460924bdab70149d1f0331faa5c01193e2
parent 4c5d1a057bc92c0c0504be83ee96c7a5f4b962b1

Merge cherrypicks of [6738238, 6739193, 6738335, 6738239, 6739470, 6739471, 6738201, 6738202, 6738203, 6738204, 6738205, 6738206, 6738207, 6738208, 6738209, 6739510, 6739511, 6739512, 6739513, 6739514, 6739515, 6739516, 6738336, 6739517, 6739518, 6738416, 6738417, 6739472, 6739473, 6739519, 6739520, 6739071, 6739072, 6738695, 6738696, 6738697, 6738698, 6738699, 6738243, 6739521, 6738244, 6738153, 6738154, 6738155, 6738156, 6738157, 6738158, 6738159, 6738160, 6739522, 6739523] into nyc-bugfix-release

Change-Id: I32e67b7be0dbe3dcf11f6a1a49fa23357c8eeaa3

src/com/android/managedprovisioning/task/InstallPackageTask.java

diff --git a/src/com/android/managedprovisioning/task/InstallPackageTask.java b/src/com/android/managedprovisioning/task/InstallPackageTask.java
index 4c7428b..f60f50a 100644
--- a/src/com/android/managedprovisioning/task/InstallPackageTask.java
+++ b/src/com/android/managedprovisioning/task/InstallPackageTask.java
@@ -23,7 +23,6 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.provider.Settings.Global;
 import android.text.TextUtils;
 import android.Manifest.permission;
 
@@ -51,7 +50,6 @@
     private final Callback mCallback;
 
     private PackageManager mPm;
-    private int mPackageVerifierEnable;
     private Set<InstallInfo> mPackagesToInstall;
 
     /**
@@ -98,11 +96,6 @@
                 installExistingPackage(info);
 
             } else if (packageContentIsCorrect(info.packageName, info.location)) {
-                // Temporarily turn off package verification.
-                mPackageVerifierEnable = Global.getInt(mContext.getContentResolver(),
-                        Global.PACKAGE_VERIFIER_ENABLE, 1);
-                Global.putInt(mContext.getContentResolver(), Global.PACKAGE_VERIFIER_ENABLE, 0);
-
                 // Allow for replacing an existing package.
                 // Needed in case this task is performed multiple times.
                 mPm.installPackage(Uri.parse("file://" + info.location),
@@ -189,9 +182,6 @@
                 return;
             }
         }
-        // Set package verification flag to its original value.
-        Global.putInt(mContext.getContentResolver(), Global.PACKAGE_VERIFIER_ENABLE,
-                mPackageVerifierEnable);
         mCallback.onSuccess();
     }