From 4b8701138500902054bd8974f20b5ccb89dd2577 Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Fri, 8 Jun 2018 21:39:58 +0000 Subject: Revert "Fix DefaultPermissionGrantPolicyTest" This ended up being not the right fix for the bug, and had a consequence of AiAi permissions becoming fixed. Per recent email thread, reverting this back to how it was This reverts commit 0988f24dfff1529552c857fb1c28592070ecc1b8. Fixes: 109665265 Change-Id: Ibf39c3b788c09f189d941f830ebbe8f371fc6f6a --- .../server/pm/permission/DefaultPermissionGrantPolicy.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index c9aa1ef1c007..1ae59cbea452 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -833,11 +833,11 @@ public final class DefaultPermissionGrantPolicy { getSystemPackage(textClassifierPackageName); if (textClassifierPackage != null && doesPackageSupportRuntimePermissions(textClassifierPackage)) { - grantRuntimePermissions(textClassifierPackage, PHONE_PERMISSIONS, true, userId); - grantRuntimePermissions(textClassifierPackage, SMS_PERMISSIONS, true, userId); - grantRuntimePermissions(textClassifierPackage, CALENDAR_PERMISSIONS, true, userId); - grantRuntimePermissions(textClassifierPackage, LOCATION_PERMISSIONS, true, userId); - grantRuntimePermissions(textClassifierPackage, CONTACTS_PERMISSIONS, true, userId); + grantRuntimePermissions(textClassifierPackage, PHONE_PERMISSIONS, false, userId); + grantRuntimePermissions(textClassifierPackage, SMS_PERMISSIONS, false, userId); + grantRuntimePermissions(textClassifierPackage, CALENDAR_PERMISSIONS, false, userId); + grantRuntimePermissions(textClassifierPackage, LOCATION_PERMISSIONS, false, userId); + grantRuntimePermissions(textClassifierPackage, CONTACTS_PERMISSIONS, false, userId); } } -- cgit v1.2.3