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

Commit 2b58c1b5 authored by rich cannings's avatar rich cannings Committed by Android (Google) Code Review
Browse files

Merge "Disable package verification in test harness" into jb-mr1-dev

parents 2032a120 a2064df6

services/java/com/android/server/pm/PackageManagerService.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -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) {