summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ben Gruver <bgruv@google.com> 2012-09-14 14:00:50 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-09-14 14:01:37 -0700
commit51fbaff11c195d3004f872d19f98a20fa6c44456 (patch)
tree254763e706a225f63f507c3f4935ec9e2947db7d
parent4f49d9450fe919868f9a9a9a44db59ca2497150c (diff)
parente4bf0eae061c821eaaec988097a8d31332d21646 (diff)
Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev
-rw-r--r--services/java/com/android/server/pm/PackageManagerService.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index e208068ec60e..5c3042d8c774 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -5902,9 +5902,12 @@ public class PackageManagerService extends IPackageManager.Stub {
* @return true if verification should be performed
*/
private boolean isVerificationEnabled() {
+ if (!DEFAULT_VERIFY_ENABLE) {
+ return false;
+ }
+
return android.provider.Settings.Global.getInt(mContext.getContentResolver(),
- android.provider.Settings.Global.PACKAGE_VERIFIER_ENABLE,
- DEFAULT_VERIFY_ENABLE ? 1 : 0) == 1 ? true : false;
+ android.provider.Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 1;
}
/**