From 2afeb5f43fc6c43e179a1d59ee5e9649380fe089 Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Fri, 22 Nov 2019 14:39:01 +0000 Subject: [PATCH] Stop relying on PACKAGE_VERIFIER_ENABLE. This setting is being removed, and it no longer controls whether a package verifier will be invoked. (Each verifier may have its own controls, but they are outside the framework.) Test: atest VerifyAppsOverUsbPreferenceControllerTest Bug: 135751498 Change-Id: I78029c3529f331a88fde42a7aac5c155954f825e --- ...VerifyAppsOverUsbPreferenceController.java | 20 ++++++------------- ...fyAppsOverUsbPreferenceControllerTest.java | 13 +----------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java index 20b8f1f002f..3b05cef454c 100644 --- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java +++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java @@ -146,19 +146,11 @@ public class VerifyAppsOverUsbPreferenceController extends DeveloperOptionsPrefe == AdbPreferenceController.ADB_SETTING_OFF) { return false; } - if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, SETTING_VALUE_ON) - == SETTING_VALUE_OFF) { - return false; - } else { - final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION); - verification.setType(PACKAGE_MIME_TYPE); - verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - final List receivers = mPackageManager.queryBroadcastReceivers( - verification, 0 /* flags */); - if (receivers.size() == 0) { - return false; - } - } - return true; + final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION); + verification.setType(PACKAGE_MIME_TYPE); + verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + final List receivers = mPackageManager.queryBroadcastReceivers( + verification, 0 /* flags */); + return receivers.size() != 0; } } diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index f0961f1202f..87b912691dd 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -129,17 +129,6 @@ public class VerifyAppsOverUsbPreferenceControllerTest { verify(mPreference).setChecked(false); } - @Test - public void updateState_verifierOff_preferenceShouldNotBeChecked() { - setupVerifyBroadcastReceivers(true); - setupEnforcedAdmin(null); - mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */) - .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */) - .set(Global.PACKAGE_VERIFIER_ENABLE, 0 /* setting disabled */); - mController.updateState(mPreference); - verify(mPreference).setChecked(false); - } - @Test public void updateState_noBroadcastReceivers_preferenceShouldNotBeChecked() { setupVerifyBroadcastReceivers(false); @@ -196,4 +185,4 @@ public class VerifyAppsOverUsbPreferenceControllerTest { assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_OFF); } -} \ No newline at end of file +}