Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev

This commit is contained in:
Ben Gruver
2012-09-14 14:00:50 -07:00
committed by Android (Google) Code Review

View File

@@ -5902,9 +5902,12 @@ public class PackageManagerService extends IPackageManager.Stub {
* @return true if verification should be performed * @return true if verification should be performed
*/ */
private boolean isVerificationEnabled() { private boolean isVerificationEnabled() {
if (!DEFAULT_VERIFY_ENABLE) {
return false;
}
return android.provider.Settings.Global.getInt(mContext.getContentResolver(), return android.provider.Settings.Global.getInt(mContext.getContentResolver(),
android.provider.Settings.Global.PACKAGE_VERIFIER_ENABLE, android.provider.Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 1;
DEFAULT_VERIFY_ENABLE ? 1 : 0) == 1 ? true : false;
} }
/** /**