commit d6b2b8c66317e800db7f3fb6134602e4c6cb23b7
author Michael Groover <mpgroover@google.com> Wed Apr 22 09:32:47 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 22 23:43:22 2020 +0000
tree 74290b652f20500cd3bfda947353b511a756a150
parent 9f98dbd80b3f80393ba7352261e1840a679fe2d5

Add READ_PHONE_STATE back to pregranted phone permissions

When READ_PHONE_STATE was moved from a runtime permission to an install
permission it was removed from the default phone permissions grant. Now
that READ_PHONE_STATE has been reverted back to a runtime permission it
needs to be added back to the list of phone permissions that are
pregranted.

Bug: 154572075
Bug: 154567729
Test: Verified com.google.shared.uid was granted READ_PHONE_STATE
Change-Id: I0e0727ed92cbf881d89d56de4e509fb1a9073556
(cherry picked from commit 140e55b469483d110aad3f664ee08727a924e026)

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

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 e3faffa..a635f98 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -125,6 +125,7 @@
 
 
     static {
+        PHONE_PERMISSIONS.add(Manifest.permission.READ_PHONE_STATE);
         PHONE_PERMISSIONS.add(Manifest.permission.CALL_PHONE);
         PHONE_PERMISSIONS.add(Manifest.permission.READ_CALL_LOG);
         PHONE_PERMISSIONS.add(Manifest.permission.WRITE_CALL_LOG);