diff options
| author | Michael Dooley <mdooley@google.com> | 2017-05-17 19:53:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-17 19:53:58 +0000 |
| commit | b65719af5eba1bf765056a4b948e4dbbb03e491f (patch) | |
| tree | b10d95f78d890ad2ea5cd06a532787b9adda29e4 | |
| parent | 85c04756e8a1b48abeb5972e11763b0757b267e4 (diff) | |
| parent | ce6419041e5d11e63bf5a1bc9913b42ba69a06ec (diff) | |
| download | Telecomm-b65719af5eba1bf765056a4b948e4dbbb03e491f.tar.gz | |
Merge "Adding config to disable temporary permission granting" into oc-dev
| -rw-r--r-- | res/values/config.xml | 4 | ||||
| -rw-r--r-- | src/com/android/server/telecom/EmergencyCallHelper.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 7dd43f4e0..111d86bce 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -46,4 +46,8 @@ different source (connection service) from the existing ringing call when reaching maximum ringing calls. --> <bool name="silence_incoming_when_different_service_and_maximum_ringing">false</bool> + + <!-- Determines if the granting temporary location permission to the default dialer + during an emergency call should be allowed. The default is false. --> + <bool name="grant_location_permission_enabled">false</bool> </resources> diff --git a/src/com/android/server/telecom/EmergencyCallHelper.java b/src/com/android/server/telecom/EmergencyCallHelper.java index f30c309cb..5b4c2fd53 100644 --- a/src/com/android/server/telecom/EmergencyCallHelper.java +++ b/src/com/android/server/telecom/EmergencyCallHelper.java @@ -75,6 +75,10 @@ public class EmergencyCallHelper { } private boolean shouldGrantTemporaryLocationPermission(Call call) { + if (!mContext.getResources().getBoolean(R.bool.grant_location_permission_enabled)) { + Log.i(this, "ShouldGrantTemporaryLocationPermission, disabled by config"); + return false; + } if (call == null) { Log.i(this, "ShouldGrantTemporaryLocationPermission, no call"); return false; |