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

Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev

Browse Source
This commit is contained in:
rich cannings
2012-09-21 13:46:42 -07:00
committed by Android (Google) Code Review
parent 987f1e759c 4e5753f5f6
commit 04c2bb86ca
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/provider/Settings.java
View File

@@ -5334,25 +5334,34 @@ public final class Settings {
* review apps prior to installation. * review apps prior to installation.
* 1 = request apps to be verified prior to installation, if a verifier exists. * 1 = request apps to be verified prior to installation, if a verifier exists.
* 0 = do not verify apps before installation * 0 = do not verify apps before installation
* {@hide} * @hide
*/ */
public static final String PACKAGE_VERIFIER_ENABLE = "package_verifier_enable"; public static final String PACKAGE_VERIFIER_ENABLE = "package_verifier_enable";
/** Timeout for package verification. /** Timeout for package verification.
* {@hide} */ * @hide */
public static final String PACKAGE_VERIFIER_TIMEOUT = "verifier_timeout"; public static final String PACKAGE_VERIFIER_TIMEOUT = "verifier_timeout";
/** Default response code for package verification. /** Default response code for package verification.
* {@hide} */ * @hide */
public static final String PACKAGE_VERIFIER_DEFAULT_RESPONSE = "verifier_default_response"; public static final String PACKAGE_VERIFIER_DEFAULT_RESPONSE = "verifier_default_response";
/** Show package verification setting in the Settings app. /**
* Show package verification setting in the Settings app.
* 1 = show (default) * 1 = show (default)
* 0 = hide * 0 = hide
* {@hide} * @hide
*/ */
public static final String PACKAGE_VERIFIER_SETTING_VISIBLE = "verifier_setting_visible"; public static final String PACKAGE_VERIFIER_SETTING_VISIBLE = "verifier_setting_visible";
/**
* Run package verificaiton on apps installed through ADB/ADT/USB
* 1 = perform package verification on ADB installs (default)
* 0 = bypass package verification on ADB installs
* @hide
*/
public static final String PACKAGE_VERIFIER_INCLUDE_ADB = "verifier_verify_adb_installs";
/** /**
* The interval in milliseconds at which to check packet counts on the * The interval in milliseconds at which to check packet counts on the
* mobile data interface when screen is on, to detect possible data * mobile data interface when screen is on, to detect possible data

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

@@ -5904,11 +5904,20 @@ 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(int flags) {
if (!DEFAULT_VERIFY_ENABLE) { if (!DEFAULT_VERIFY_ENABLE) {
return false; return false;
} }
// Check if installing from ADB
if ((flags & PackageManager.INSTALL_FROM_ADB) != 0) {
// Check if the developer does not want package verification for ADB installs
if (android.provider.Settings.Global.getInt(mContext.getContentResolver(),
android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) == 0) {
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, 1) == 1; android.provider.Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 1;
} }
@@ -6406,7 +6415,7 @@ public class PackageManagerService extends IPackageManager.Stub {
*/ */
final int requiredUid = mRequiredVerifierPackage == null ? -1 final int requiredUid = mRequiredVerifierPackage == null ? -1
: getPackageUid(mRequiredVerifierPackage, 0); : getPackageUid(mRequiredVerifierPackage, 0);
if (requiredUid != -1 && isVerificationEnabled()) { if (requiredUid != -1 && isVerificationEnabled(flags)) {
final Intent verification = new Intent( final Intent verification = new Intent(
Intent.ACTION_PACKAGE_NEEDS_VERIFICATION); Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
verification.setDataAndType(getPackageUri(), PACKAGE_MIME_TYPE); verification.setDataAndType(getPackageUri(), PACKAGE_MIME_TYPE);