summaryrefslogtreecommitdiff
path: root/test-mock
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2018-07-18 15:41:24 -0700
committerPhilip P. Moltmann <moltmann@google.com>2018-07-24 11:45:34 -0700
commit6c644e620d541e52d3f4e32fddc689aa5e5350e6 (patch)
treefa932fbf9d77fd0c721a775d6aa776184568ccdf /test-mock
parent148cd8c0bced9bcd72beb2e93a086fde9dcfef9e (diff)
Always review permissions before <M app is started the first time
This splits the - review permissions - individually control permissions - consent to manage wireleess (wifi + bluetooth) properties. Almost all code cares only for the first and it is now always true. Hence a lot of code can be simplified. Bug: 110431654 Test: atest PermissionsHostTest started pre-M app Change-Id: I733cd476ccd0bf5eaa59e9a9506db34f57c6baee
Diffstat (limited to 'test-mock')
-rw-r--r--test-mock/src/android/test/mock/MockPackageManager.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/test-mock/src/android/test/mock/MockPackageManager.java b/test-mock/src/android/test/mock/MockPackageManager.java
index c2aca6b4c185..89734e35c13f 100644
--- a/test-mock/src/android/test/mock/MockPackageManager.java
+++ b/test-mock/src/android/test/mock/MockPackageManager.java
@@ -159,7 +159,13 @@ public class MockPackageManager extends PackageManager {
/** @hide */
@Override
- public boolean isPermissionReviewModeEnabled() {
+ public boolean arePermissionsIndividuallyControlled() {
+ return false;
+ }
+
+ /** @hide */
+ @Override
+ public boolean isWirelessConsentModeEnabled() {
return false;
}