From 643f913ee584efcaddce0921b9f9e21f42698423 Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Thu, 28 May 2020 14:12:20 -0700 Subject: [PATCH] Don't reset mode for OP_REQUEST_INSTALL_PACKAGES. Settings allows the user to control the app op if it's not in the default mode, regardless of whether the app has requested the permission, so we should not reset it. Fixes: 150819885 Test: atest CtsNoPermissionTestCases25 Change-Id: Iba87574febe8c0f8ed5c779c19f00b39d811a835 --- .../com/android/server/policy/PermissionPolicyService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java index 5e2c4eb45086f..3ee5f5097d593 100644 --- a/services/core/java/com/android/server/policy/PermissionPolicyService.java +++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java @@ -208,6 +208,11 @@ public final class PermissionPolicyService extends SystemService { case android.Manifest.permission.ACCESS_NOTIFICATIONS: case android.Manifest.permission.MANAGE_IPSEC_TUNNELS: continue; + case android.Manifest.permission.REQUEST_INSTALL_PACKAGES: + // Settings allows the user to control the app op if it's not in the default + // mode, regardless of whether the app has requested the permission, so we + // should not reset it. + continue; default: final int appOpCode = AppOpsManager.permissionToOpCode( appOpPermissionInfo.name);