PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop relying on PACKAGE_VERIFIER_ENABLE."

Browse Source
This commit is contained in:
Alan Stokes
2019-11-25 11:27:51 +00:00
committed by Android (Google) Code Review
parent fbc8bbf870 2afeb5f43f
commit 3596aeeca7
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
View File

@@ -146,19 +146,11 @@ public class VerifyAppsOverUsbPreferenceController extends DeveloperOptionsPrefe
== AdbPreferenceController.ADB_SETTING_OFF) { == AdbPreferenceController.ADB_SETTING_OFF) {
return false; return false;
} }
if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, SETTING_VALUE_ON) final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
== SETTING_VALUE_OFF) { verification.setType(PACKAGE_MIME_TYPE);
return false; verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
} else { final List<ResolveInfo> receivers = mPackageManager.queryBroadcastReceivers(
final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION); verification, 0 /* flags */);
verification.setType(PACKAGE_MIME_TYPE); return receivers.size() != 0;
verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
final List<ResolveInfo> receivers = mPackageManager.queryBroadcastReceivers(
verification, 0 /* flags */);
if (receivers.size() == 0) {
return false;
}
}
return true;
} }
} }

13
tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
View File

@@ -129,17 +129,6 @@ public class VerifyAppsOverUsbPreferenceControllerTest {
verify(mPreference).setChecked(false); 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 @Test
public void updateState_noBroadcastReceivers_preferenceShouldNotBeChecked() { public void updateState_noBroadcastReceivers_preferenceShouldNotBeChecked() {
setupVerifyBroadcastReceivers(false); setupVerifyBroadcastReceivers(false);
@@ -196,4 +185,4 @@ public class VerifyAppsOverUsbPreferenceControllerTest {
assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_OFF); assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_OFF);
} }
} }