commit 811825a582812e51412fee5d712259502a7f023b
author Chad Brubaker <cbrubaker@google.com> Tue Dec 06 12:31:15 2016 -0800
committer Chad Brubaker <cbrubaker@google.com> Wed Dec 07 11:05:03 2016 -0800
tree 166e493e97e2735d5420dec305fe4c0e9e966754
parent 5026cabbe17645bfd978a1d724153bd449b89811

Add proto fields for READ_PHONE_NUMBER

Test: m
Change-Id: Ifc8c9eed3af6baa405714cda664cc9dc60969cb9

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index c1bb506..ef9d8f2 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -3089,6 +3089,22 @@
     // ACTION: Logged when a provisioning session has completed
     PROVISIONING_SESSION_COMPLETED = 735;
 
+    // ACTION: An app requested the permission READ_PHONE_NUMBER
+    // PACKAGE: The package name of the app requesting the permission
+    ACTION_PERMISSION_REQUEST_READ_PHONE_NUMBER = 736;
+
+    // ACTION: An app was granted the permission READ_PHONE_NUMBER
+    // PACKAGE: The package name of the app that was granted the permission
+    ACTION_PERMISSION_GRANT_READ_PHONE_NUMBER = 737;
+
+    // ACTION: An app requested the permission READ_PHONE_NUMBER and the request was denied
+    // PACKAGE: The package name of the app requesting the permission
+    ACTION_PERMISSION_DENIED_READ_PHONE_NUMBER = 738;
+
+    // ACTION: The permission READ_PHONE_NUMBER was revoked for an app
+    // PACKAGE: The package name of the app the permission was revoked for
+    ACTION_PERMISSION_REVOKE_READ_PHONE_NUMBER = 739;
+
     // ---- End O Constants, all O constants go above this line ----
 
     // Add new aosp constants above this line.

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 25f0677..6f99679 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -544,7 +544,6 @@
             Manifest.permission.ACCESS_COARSE_LOCATION,
             Manifest.permission.RECORD_AUDIO,
             Manifest.permission.READ_PHONE_STATE,
-            Manifest.permission.READ_PHONE_NUMBER,
             Manifest.permission.CALL_PHONE,
             Manifest.permission.READ_CALL_LOG,
             Manifest.permission.WRITE_CALL_LOG,
@@ -559,7 +558,8 @@
             Manifest.permission.RECEIVE_WAP_PUSH,
             Manifest.permission.RECEIVE_MMS,
             Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE);
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.READ_PHONE_NUMBER);
 
     final ServiceThread mHandlerThread;