diff options
| author | 2016-12-07 21:04:30 +0000 | |
|---|---|---|
| committer | 2016-12-07 21:04:34 +0000 | |
| commit | f4ca1211f7d82dfeb6ffceeba1061335ffcea60f (patch) | |
| tree | b7ec63f91961db06c8fec018e16627388160e269 | |
| parent | 9a648a1c74f39b8aca525ae3787d379cb4c76971 (diff) | |
| parent | 811825a582812e51412fee5d712259502a7f023b (diff) | |
Merge "Add proto fields for READ_PHONE_NUMBER"
| -rw-r--r-- | proto/src/metrics_constants.proto | 16 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index c1bb506fcfc2..ef9d8f2c22c1 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -3089,6 +3089,22 @@ message MetricsEvent { // 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. diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 25f0677636ff..6f99679b6877 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 @@ public class PackageManagerService extends IPackageManager.Stub { 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 @@ public class PackageManagerService extends IPackageManager.Stub { 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; |