summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Stokes <alanstokes@google.com> 2019-11-20 15:27:23 +0000
committer Alan Stokes <alanstokes@google.com> 2019-11-20 16:03:49 +0000
commit9c190968cf975ed5eed8979e0ca18d0ac21c36b7 (patch)
tree9553dc579feba26520e4aea01bad7ebb099291a8
parent03ac9e57544be5c1690b32abec1acc0cab575ee7 (diff)
Test harness setting shouldn't prevent verification.
Doing so prevents us running GTS tests of the package verifier. Test harnesses can achieve the same effect in a less irreversible way using PACKAGE_VERIFIER_INCLUDE_ADB, and as far as I can tell they already do so. Note also that isRunningInTestHarness() is deprecated. Test: atest PackageVerifierTest Test: Verified tests pass even if ro.test_harness is set to 1 Bug: 137937263 Bug: 135751498 Bug: 7233608 Change-Id: I3b7966b4a26055b2a9fbd02d6e307c7fc7bf22f6
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index fa98c962afbf..2b5ad2260860 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -13218,10 +13218,6 @@ public class PackageManagerService extends IPackageManager.Stub
// Check if installing from ADB
if ((installFlags & PackageManager.INSTALL_FROM_ADB) != 0) {
- // Do not run verification in a test harness environment
- if (ActivityManager.isRunningInTestHarness()) {
- return false;
- }
if (isUserRestricted(userId, UserManager.ENSURE_VERIFY_APPS)) {
return true;
}