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

am 60000916: am 2b58c1b5: Merge "Disable package verification in test harness" into jb-mr1-dev

Browse Source 
* commit '6000091663200e8846f418db99f2b4618cc6a294':
  Disable package verification in test harness
This commit is contained in:
rich cannings
2012-10-01 10:16:14 -07:00
committed by Android Git Automerger
parent df1d4c44f7 6000091663
commit fdd8a81015
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -45,6 +45,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer; import org.xmlpull.v1.XmlSerializer;
import android.app.ActivityManager;
import android.app.ActivityManagerNative; import android.app.ActivityManagerNative;
import android.app.IActivityManager; import android.app.IActivityManager;
import android.app.admin.IDevicePolicyManager; import android.app.admin.IDevicePolicyManager;
@@ -5890,6 +5891,10 @@ public class PackageManagerService extends IPackageManager.Stub {
// Check if installing from ADB // Check if installing from ADB
if ((flags & PackageManager.INSTALL_FROM_ADB) != 0) { if ((flags & PackageManager.INSTALL_FROM_ADB) != 0) {
// Do not run verification in a test harness environment
if (ActivityManager.isRunningInTestHarness()) {
return false;
}
// Check if the developer does not want package verification for ADB installs // Check if the developer does not want package verification for ADB installs
if (android.provider.Settings.Global.getInt(mContext.getContentResolver(), if (android.provider.Settings.Global.getInt(mContext.getContentResolver(),
android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) == 0) { android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) == 0) {